cloudster 2.17.0 → 2.18.0

data/VERSION

@@ -1 +1 @@
-2.17.0
+2.18.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.17.0"
+  s.version = "2.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2013-01-07"
+  s.date = "2013-01-08"
   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 = [
@@ -37,15 +37,18 @@ Gem::Specification.new do |s|
     "lib/cloudster/elasticache.rb",
     "lib/cloudster/elb.rb",
     "lib/cloudster/options_manager.rb",
+    "lib/cloudster/output.rb",
     "lib/cloudster/rds.rb",
     "lib/cloudster/s3.rb",
     "spec/chef_client_spec.rb",
     "spec/cloud_front_spec.rb",
     "spec/cloud_spec.rb",
+    "spec/deep_merge_spec.rb",
     "spec/ec2_spec.rb",
     "spec/elastic_ip_spec.rb",
     "spec/elasticache_spec.rb",
     "spec/elb_spec.rb",
+    "spec/output_spec.rb",
     "spec/rds_spec.rb",
     "spec/s3_spec.rb",
     "spec/spec_helper.rb"

data/lib/cloudster.rb

@@ -2,6 +2,7 @@
 #This file requires all dependencies
 require 'json'
 require 'fog'
+require 'cloudster/output'
 require 'cloudster/options_manager'
 require 'cloudster/deep_merge'
 include OptionsManager

data/lib/cloudster/cloud.rb

@@ -59,14 +59,17 @@ module Cloudster
       resources = options[:resources]
       description = options[:description] || 'This stack is created by Cloudster'
       resource_template = {}
+      output_template = {}
       resources.each do |resource|
         resource_template.merge!(resource.template['Resources'])
+        output_template.merge!(resource.template['Outputs']) unless resource.template['Outputs'].nil?
       end
 
       cloud_template = {'AWSTemplateFormatVersion' => '2010-09-09',
-                  'Description' => description,
-                  'Resources' => resource_template
+                  'Description' => description
       }
+      cloud_template['Resources'] = resource_template if !resource_template.empty?
+      cloud_template['Outputs'] = output_template if !output_template.empty?
       return cloud_template.to_json
     end
 
@@ -257,7 +260,7 @@ module Cloudster
       ec2_resource_ids.each do |key, value|
         ec2_instance_details = ec2.describe_instances('instance-id' => value)
         ec2_details[key] = ec2_instance_details.body["reservationSet"][0]["instancesSet"][0] rescue nil
-      end 
+      end
       return ec2_details
     end
 

data/lib/cloudster/deep_merge.rb

@@ -1,4 +1,4 @@
-# Stolen shamelessly from here http://apidock.com/rails/Hash/deep_merge!
+# Stolen shamelessly from Rails : http://apidock.com/rails/Hash/deep_merge!
 class Hash
   def deep_merge(other_hash)
     other_hash.each_pair do |k,v|

data/lib/cloudster/options_manager.rb

@@ -6,4 +6,9 @@ module OptionsManager
     end
     raise ArgumentError, "Missing required argument: #{missing_args.join(',')}" unless missing_args.empty?
   end
+
+  def validate_option_in_list(option, list)
+    raise ArgumentError, "Option: #{option} should be one of #{list.inspect}" unless list.include?(option)
+  end
+
 end

data/lib/cloudster/output.rb

@@ -0,0 +1,17 @@
+module Cloudster
+  module Output
+    # Returns the Output template for resources
+    #
+    # ==== Parameters
+    # * output: Hash containing the valid outputs and their cloudformation translations
+    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]}}
+      return resource_name => {
+        'Value' => { "Fn::Join" => [ ",", each_output_join] }
+      }
+    end
+
+  end
+end

data/lib/cloudster/s3.rb

@@ -1,6 +1,8 @@
 module Cloudster
   #S3 Resource
+  #Output values : bucket_name, dns_name, website_url
   class S3
+    extend Cloudster::Output
 
     attr_accessor :name, :template
     # Initialize a s3 bucket
@@ -38,7 +40,12 @@ module Cloudster
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template for the s3 resource
     def template
-      @template ||= S3.template({:name => @name, :access_control => @access_control, :website_configuration => @website_configuration})
+      @template ||= S3.template({
+        :name => @name,
+        :access_control => @access_control,
+        :website_configuration => @website_configuration,
+        :outputs => @outputs
+      })
     end
 
     # Class method that returns a Ruby hash version of the Cloud Formation template
@@ -63,13 +70,22 @@ module Cloudster
       unless options[:website_configuration].nil?
         properties.merge!({"WebsiteConfiguration" => {"IndexDocument" => options[:website_configuration]["index_document"], "ErrorDocument" => options[:website_configuration]["error_document"]}})
       end
-      template = {'Resources' => {
-                        options[:name] => {
-                          'Type' => 'AWS::S3::Bucket',
-                          'Properties' => properties
-                       }
-                  }
+      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] => {
+            'Type' => 'AWS::S3::Bucket',
+            'Properties' => properties
+          }
+        }
+      }
+      template['Outputs'] = output_template(outputs)
       return template
     end
   end

data/spec/cloud_front_spec.rb

@@ -33,6 +33,19 @@ describe Cloudster::ChefClient do
                   "Enabled"=>"true"
                 }
               }
+            },
+          },
+          "Outputs" => {
+            "S3ResourceName"=>{
+              "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"]}]]}
+                  ]
+                ]
+              }
             }
           }
         }

data/spec/deep_merge_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Hash" do
+  describe "#deep_merge" do
+    it "should do a deep merge for new keys and deep override for existing keys" do
+      hash1 = {
+        'key1' => 'value1',
+        'key2' => {
+          'inner_key1' =>'inner_value1',
+          'inner_key2' =>'inner_value2'
+        }
+      }
+      hash2 = {
+        'key_to_merge' => 'value_to_merge',
+        'key2' => {
+          'inner_key_to_be_merged' =>'inner_value_to_be_merged',
+          'inner_key2' =>'inner_value_to_override'
+        }
+      }
+      hash1.deep_merge(hash2).should == {
+        "key1"=>"value1",
+        "key2"=>{
+          "inner_key1"=>"inner_value1",
+          "inner_key2"=>"inner_value_to_override",
+          "inner_key_to_be_merged"=>"inner_value_to_be_merged"
+        },
+        "key_to_merge"=>"value_to_merge"
+      }
+    end
+  end
+end

data/spec/output_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Cloudster::Output do
+  describe "output_template" do
+    it "should return the cloudformation template for the Outputs" do
+      resource_name = "S3ResourceName"
+      outputs = {
+        resource_name => {
+          'bucket_name' => {"Ref" => resource_name },
+          'dns_name' => {'Fn::GetAtt' => [resource_name, 'DomainName']}
+        }
+      }
+      class Resource;end
+      Resource.extend(Cloudster::Output)
+      Resource.output_template(outputs).should == {
+        resource_name => {
+          "Value" => {
+            "Fn::Join" => [ ",",[
+              {"Fn::Join" => [":", ['bucket_name', {"Ref" => resource_name } ] ]},
+              {"Fn::Join" => [":", ['dns_name', {'Fn::GetAtt' => [resource_name, 'DomainName']} ] ]}
+            ]]
+          }
+        }
+      }
+    end
+  end
+end

data/spec/s3_spec.rb

@@ -13,11 +13,17 @@ describe Cloudster::S3 do
   describe '#template' do
     it "should return a ruby hash for the resource cloudformation template with only mandatory fields" do
       s3 = Cloudster::S3.new(:name => 'bucket_name')
-      s3.template.should == {'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {}}}}
+      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"]}]]}]]}}}
+      }
     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" } }}}}
+      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"]}]]}]]}}}
+      }
     end
   end
 
@@ -27,7 +33,10 @@ describe Cloudster::S3 do
     end
     it "should return a ruby hash for the resource cloudformation template" 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" } }}}}
+      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"]}]]}]]}}}
+      }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -139,15 +139,18 @@ files:
 - lib/cloudster/elasticache.rb
 - lib/cloudster/elb.rb
 - lib/cloudster/options_manager.rb
+- lib/cloudster/output.rb
 - lib/cloudster/rds.rb
 - lib/cloudster/s3.rb
 - spec/chef_client_spec.rb
 - spec/cloud_front_spec.rb
 - spec/cloud_spec.rb
+- spec/deep_merge_spec.rb
 - spec/ec2_spec.rb
 - spec/elastic_ip_spec.rb
 - spec/elasticache_spec.rb
 - spec/elb_spec.rb
+- spec/output_spec.rb
 - spec/rds_spec.rb
 - spec/s3_spec.rb
 - spec/spec_helper.rb
@@ -166,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 500109
+      hash: 571049873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: