cloudster 2.19.1 → 2.19.2

data/README.md

@@ -30,7 +30,7 @@ Create AWS resources :
      :interval => 1800
     )
 
-    elastic_ip = Cloudster::ElasticIp.new
+    elastic_ip = Cloudster::ElasticIp.new(:name => 'AppServerElasticIp')
 
     chef_client.add_to(app_server)
     elastic_ip.add_to(app_server)

data/VERSION

@@ -1 +1 @@
-2.19.1
+2.19.2

data/cloudster.gemspec

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

@@ -1,6 +1,8 @@
 module Cloudster
   #==Ec2 resource
+  #Output values : availability_zone, private_dns_name, public_dns_name, private_ip, public_ip
   class Ec2
+    extend Cloudster::Output
 
     attr_accessor :template, :name
     # Initialize an Ec2 instance
@@ -88,6 +90,16 @@ module Cloudster
                        }
                   }
       }
+      outputs = {
+        options[:name] => {
+          'availablity_zone' => {'Fn::GetAtt' => [options[:name], 'AvailabilityZone']},
+          'private_dns_name' => {'Fn::GetAtt' => [options[:name], 'PrivateDnsName']},
+          'public_dns_name' => {'Fn::GetAtt' => [options[:name], 'PublicDnsName']},
+          'private_ip' => {'Fn::GetAtt' => [options[:name], 'PrivateIp']},
+          'public_ip' => {'Fn::GetAtt' => [options[:name], 'PublicIp']}
+        }
+      }
+      template['Outputs'] = output_template(outputs)
       return template
     end
 

data/lib/cloudster/s3.rb

@@ -43,8 +43,7 @@ module Cloudster
       @template ||= S3.template({
         :name => @name,
         :access_control => @access_control,
-        :website_configuration => @website_configuration,
-        :outputs => @outputs
+        :website_configuration => @website_configuration
       })
     end
 
@@ -70,13 +69,6 @@ module Cloudster
       unless options[:website_configuration].nil?
         properties.merge!({"WebsiteConfiguration" => {"IndexDocument" => options[:website_configuration]["index_document"], "ErrorDocument" => options[:website_configuration]["error_document"]}})
       end
-      outputs = {
-        options[:name] => {
-          'bucket_name' => { 'Ref' => options[:name] },
-          'dns_name' => {'Fn::GetAtt' => [options[:name], 'DomainName']},
-          'website_url' => {'Fn::GetAtt' => [options[:name], 'WebsiteURL']}
-        }
-      }
       template = {
         'Resources' => {
           options[:name] => {
@@ -85,6 +77,13 @@ module Cloudster
           }
         }
       }
+      outputs = {
+        options[:name] => {
+          'bucket_name' => { 'Ref' => options[:name] },
+          'dns_name' => {'Fn::GetAtt' => [options[:name], 'DomainName']},
+          'website_url' => {'Fn::GetAtt' => [options[:name], 'WebsiteURL']}
+        }
+      }
       template['Outputs'] = output_template(outputs)
       return template
     end

data/spec/chef_client_spec.rb

@@ -80,6 +80,21 @@ describe Cloudster::ChefClient do
                 }
               }
             }
+          },
+          "Outputs" => {
+            "AppServer"=>{
+              "Value"=>{
+                "Fn::Join"=>[",", 
+                  [
+                    {"Fn::Join"=>["|", ["availablity_zone", {"Fn::GetAtt"=>["AppServer", "AvailabilityZone"]}]]},
+                    {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["AppServer", "PrivateDnsName"]}]]},
+                    {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["AppServer", "PublicDnsName"]}]]},
+                    {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["AppServer", "PrivateIp"]}]]},
+                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]}
+                  ]
+                ]
+              }
+            }
           }
         }
     end

data/spec/cloud_spec.rb

@@ -11,21 +11,21 @@ describe Cloudster::Cloud do
   end
   describe '#template' do
     it "should return a ruby hash for the stack cloudformation template" do
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
-      ec2_1 = Cloudster::Ec2.new(:key_name => 'testkey1', :image_id => 'image_id1', :name => 'name1')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'Ec2Instance1')
+      ec2_1 = Cloudster::Ec2.new(:key_name => 'testkey1', :image_id => 'image_id1', :name => 'Ec2Instance2')
       rds = Cloudster::Rds.new(:name => 'MySqlDB', :storage_size => '10') 
-      elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['name','name1'])
+      elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['Ec2Instance1','Ec2Instance2'])
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       cloud.template(:resources => [ec2, ec2_1, rds, elb], :description => 'test template').should == {"AWSTemplateFormatVersion"=>"2010-09-09", 
         "Description"=>"test template",
         "Resources"=>{
-          "name"=>{
+          "Ec2Instance1"=>{
             "Type"=>"AWS::EC2::Instance",
             "Properties"=>{
               "KeyName"=>"testkey",
               "ImageId"=>"image_id"}
             },
-           "name1"=>{
+           "Ec2Instance2"=>{
              "Type"=>"AWS::EC2::Instance",
              "Properties"=>{
                 "KeyName"=>"testkey1", 
@@ -62,7 +62,35 @@ describe Cloudster::Cloud do
                  "UnhealthyThreshold" => "5",
                  "Interval" => "30", "Timeout" => "5" 
                },
-               "Instances" => [{ "Ref" => "name"}, {"Ref" => "name1"}]}
+               "Instances" => [{ "Ref" => "Ec2Instance1"}, {"Ref" => "Ec2Instance2"}]}
+            }
+          },
+          "Outputs" => {
+            "Ec2Instance1"=> {
+              "Value" => {
+                "Fn::Join" => ["," ,
+                  [
+                    {"Fn::Join" => ["|", ["availablity_zone", {'Fn::GetAtt' => ['Ec2Instance1', 'AvailabilityZone']}]]},
+                    {"Fn::Join" => ["|", ["private_dns_name", {'Fn::GetAtt' => ['Ec2Instance1', 'PrivateDnsName']}]]},
+                    {"Fn::Join" => ["|", ["public_dns_name", {'Fn::GetAtt' => ['Ec2Instance1', 'PublicDnsName']}]]},
+                    {"Fn::Join" => ["|", ["private_ip", {'Fn::GetAtt' => ['Ec2Instance1', 'PrivateIp']}]]},
+                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance1', 'PublicIp']}]]}
+                  ]
+                ]
+              }
+            },
+            "Ec2Instance2"=> {
+              "Value" => {
+                "Fn::Join" => ["," ,
+                  [
+                    {"Fn::Join" => ["|", ["availablity_zone", {'Fn::GetAtt' => ['Ec2Instance2', 'AvailabilityZone']}]]},
+                    {"Fn::Join" => ["|", ["private_dns_name", {'Fn::GetAtt' => ['Ec2Instance2', 'PrivateDnsName']}]]},
+                    {"Fn::Join" => ["|", ["public_dns_name", {'Fn::GetAtt' => ['Ec2Instance2', 'PublicDnsName']}]]},
+                    {"Fn::Join" => ["|", ["private_ip", {'Fn::GetAtt' => ['Ec2Instance2', 'PrivateIp']}]]},
+                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance2', 'PublicIp']}]]}
+                  ]
+                ]
+              }
             }
           }
       }.to_json
@@ -71,15 +99,15 @@ describe Cloudster::Cloud do
 
   describe '#provision' do
     it "should raise argument error if resources not provided" do
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'Ec2Instance1')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       expect { cloud.provision(:description => 'test') }.to raise_error(ArgumentError, 'Missing required argument: resources,stack_name' )
     end
     it "should trigger stack creation" 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
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
-      elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['name','name1'])
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'Ec2Instance1')
+      elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['Ec2Instance1','Ec2Instance2'])
       rds = Cloudster::Rds.new(:name => 'MySqlDB', :storage_size => '10')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       cloud_formation.should_receive('create_stack').with('stack_name', 'TemplateBody' => cloud.template(:resources => [ec2, elb, rds], :description => 'testDescription'))
@@ -89,14 +117,14 @@ describe Cloudster::Cloud do
 
   describe '#update' do
     it "should raise argument error if resources not provided" do
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'Ec2Instance1')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       expect { cloud.update(:description => 'test') }.to raise_error(ArgumentError, 'Missing required argument: resources,stack_name' )
     end
     it "should trigger stack update" 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
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'Ec2Instance1')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       cloud_formation.should_receive('update_stack').with('stack_name', 'TemplateBody' => cloud.template(:resources => [ec2], :description => 'testDescription'))
       cloud.update(:resources => [ec2], :stack_name => 'stack_name', :description => 'testDescription')

data/spec/ec2_spec.rb

@@ -15,7 +15,34 @@ describe Cloudster::Ec2 do
   describe '#template' do
     it "should return a ruby hash for the resource cloudformation template" do
       ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name', :instance_type => 't1.micro', :security_groups => ["testSecurityGroup1", "testSecurityGroup2"] )
-      ec2.template.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id', "InstanceType" => 't1.micro', "SecurityGroups" => ["testSecurityGroup1", "testSecurityGroup2"]} }}}
+      ec2.template.should == {
+        'Resources' => {
+          'name' => {
+            'Type' => 'AWS::EC2::Instance',
+            'Properties' => {
+              "KeyName" => 'testkey',
+              "ImageId" => 'image_id',
+              "InstanceType" => 't1.micro',
+              "SecurityGroups" => ["testSecurityGroup1", "testSecurityGroup2"]
+            }
+          }
+        },
+        "Outputs" => {
+          "name"=>{
+            "Value"=>{
+              "Fn::Join"=>[",", 
+                [
+                  {"Fn::Join"=>["|", ["availablity_zone", {"Fn::GetAtt"=>["name", "AvailabilityZone"]}]]},
+                  {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["name", "PrivateDnsName"]}]]},
+                  {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["name", "PublicDnsName"]}]]},
+                  {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["name", "PrivateIp"]}]]},
+                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]}
+                ]
+              ]
+            }
+          }
+        }
+      }
     end
   end
   describe '.template' do
@@ -24,7 +51,34 @@ describe Cloudster::Ec2 do
     end
     it "should return a ruby hash for the resource cloudformation template" do
       hash = Cloudster::Ec2.template(:key_name => 'testkey', :image_id => 'image_id', :name => 'name', :instance_type => 't1.micro', :security_groups => ["testSecurityGroup1"])
-      hash.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id', "InstanceType" => 't1.micro', "SecurityGroups" => ["testSecurityGroup1"]} }}}
+      hash.should == {
+        'Resources' => {
+          'name' => {
+            'Type' => 'AWS::EC2::Instance',
+            'Properties' => {
+              "KeyName" => 'testkey',
+              "ImageId" => 'image_id',
+              "InstanceType" => 't1.micro',
+              "SecurityGroups" => ["testSecurityGroup1"]
+            }
+          }
+        },
+        "Outputs" => {
+          "name"=>{
+            "Value"=>{
+              "Fn::Join"=>[",", 
+                [
+                  {"Fn::Join"=>["|", ["availablity_zone", {"Fn::GetAtt"=>["name", "AvailabilityZone"]}]]},
+                  {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["name", "PrivateDnsName"]}]]},
+                  {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["name", "PublicDnsName"]}]]},
+                  {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["name", "PrivateIp"]}]]},
+                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]}
+                ]
+              ]
+            }
+          }
+        }
+      }
     end
   end
 end

data/spec/elastic_ip_spec.rb

@@ -33,6 +33,21 @@ describe Cloudster::ChefClient do
                 }
               }
             }
+          },
+          "Outputs" => {
+            "AppServer"=>{
+              "Value"=>{
+                "Fn::Join"=>[",", 
+                  [
+                    {"Fn::Join"=>["|", ["availablity_zone", {"Fn::GetAtt"=>["AppServer", "AvailabilityZone"]}]]},
+                    {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["AppServer", "PrivateDnsName"]}]]},
+                    {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["AppServer", "PublicDnsName"]}]]},
+                    {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["AppServer", "PrivateIp"]}]]},
+                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]}
+                  ]
+                ]
+              }
+            }
           }
         }
     end

metadata

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