cloudster 2.2.0 → 2.3.0

data/README.md

@@ -19,10 +19,13 @@ Create AWS EC2 resources as shown here:
       :image_id => 'ami_image_id',
       :instance_type => 't1.micro'
     )
-    app_server_2 = Cloudster::Ec2.new(:name => 'AppServer',
+    app_server_2 = Cloudster::Ec2.new(:name => 'AppServer2',
       :key_name => 'mykey',
       :image_id => 'ami_image_id'
     )
+    load_balancer = Cloudster::Elb.new(:name => 'LoadBalancer',
+      :instance_names => ['AppServer', 'AppServer2']
+    )
 
 Create a stack out of the resources :
 
@@ -35,15 +38,11 @@ Now you can do stuff like :
         app_server.template
 - Get the CloudFormation template for the stack :
     
-        stack.template(:resources => [app_server, app_server_2], :description => 'Description of the stack')
+        stack.template(:resources => [app_server, app_server_2, load_balancer], :description => 'Description of the stack')
     
 - Provision the stack :
 
-        stack.provision(:resources => [app_server, app_server_2], :stack_name => 'TestStack', :description => 'Description of the stack')
-
-- Update the stack :
-
-        stack.update(:resources => [app_server, app_server_2], :stack_name => 'TestStack', :description => 'Description of the stack')
+        stack.provision(:resources => [app_server, app_server_2, load_balancer], :stack_name => 'TestStack', :description => 'Description of the stack')
 
 - You can get the events of a stack using :
 

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2012-10-29"
+  s.date = "2012-10-30"
   s.description = "Cloudster uses the AWS APIs to provision stacks on Amazon Cloud."
   s.email = "emil.soman@gmail.com"
   s.extra_rdoc_files = [
@@ -29,9 +29,11 @@ Gem::Specification.new do |s|
     "lib/cloudster.rb",
     "lib/cloudster/cloud.rb",
     "lib/cloudster/ec2.rb",
+    "lib/cloudster/elb.rb",
     "lib/cloudster/options_manager.rb",
     "spec/cloud_spec.rb",
     "spec/ec2_spec.rb",
+    "spec/elb_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/emilsoman/cloudster"

data/lib/cloudster.rb

@@ -5,4 +5,5 @@ require 'fog'
 require 'cloudster/options_manager'
 include OptionsManager
 require 'cloudster/ec2'
+require 'cloudster/elb'
 require 'cloudster/cloud'

data/lib/cloudster/elb.rb

@@ -0,0 +1,94 @@
+module Cloudster
+  #==Elb resource
+  class Elb
+
+    # Initialize an Elb instance
+    #
+    # ==== Notes
+    # options parameter must include values for :name, :instance_names
+    #
+    # ==== Examples
+    #   elb = Cloudster::Elb.new(
+    #    :name => 'LoadBalancer',
+    #    :instance_names => ['AppServer1','AppServer2']
+    #   )
+    #
+    # ==== Parameters
+    # * options<~Hash> - 
+    #     * :name: String containing the name for the Elb resource
+    #     * :instance_names: Array containing the names of the Ec2 resources which will be added under the ELB
+    def initialize(options = {})
+      require_options(options, [:name, :instance_names])
+      @name = options[:name]
+      @instance_names = options[:instance_names]
+    end
+
+    # Returns a Ruby hash version of the Cloud Formation template for the resource instance
+    #
+    # ==== Examples
+    #   elb = Cloudster::Elb.new(
+    #    :name => 'LoadBalancer',
+    #    :instance_names => ['AppServer1','AppServer2']
+    #   )
+    #   elb.template
+    #
+    # ==== Returns
+    # * Ruby hash version of the Cloud Formation template for the resource instance
+    def template
+      Elb.template({:name =>@name, :instance_names => @instance_names})
+    end
+
+    # Class method that returns a Ruby hash version of the Cloud Formation template
+    #
+    # ==== Examples
+    #   template = Cloudster::Elb.template(
+    #    :name => 'LoadBalances',
+    #    :instance_names => ['AppServer1', 'AppServer2']
+    #   )
+    #
+    # ==== Parameters
+    # * options<~Hash> - 
+    #   *Keys: 
+    #     * :name: String containing the name for the Elb resource
+    #     * :instance_names: Array containing the names of the Ec2 resources which will be added under the ELB
+    #
+    # ==== Returns
+    # * Ruby hash version of the Cloud Formation template
+    def self.template(options = {})
+      require_options(options, [:name, :instance_names])
+      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"
+        }
+      }
+      properties.merge!({"Instances" => get_instance_name_list_for_template(options[:instance_names])})
+      template = {'Resources' => { 
+                        options[:name] => { 
+                          'Type' => 'AWS::ElasticLoadBalancing::LoadBalancer',
+                          'Properties' => properties
+                       }
+                  }
+      }
+      return template 
+    end
+
+    private
+      #Gets the instance names in a format expected by the Template for ELB
+      def self.get_instance_name_list_for_template(instance_names)
+        instance_list = []
+        instance_names.each do |instance_name|
+          instance_list << {'Ref' => instance_name}
+        end
+        return instance_list
+      end
+
+  end
+end

data/spec/cloud_spec.rb

@@ -13,8 +13,47 @@ describe Cloudster::Cloud 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')
+      elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['name','name1'])
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
-      cloud.template(:resources => [ec2, ec2_1], :description => 'test template').should == {"AWSTemplateFormatVersion"=>"2010-09-09", "Description"=>"test template", "Resources"=>{"name"=>{"Type"=>"AWS::EC2::Instance", "Properties"=>{"KeyName"=>"testkey", "ImageId"=>"image_id"}}, "name1"=>{"Type"=>"AWS::EC2::Instance", "Properties"=>{"KeyName"=>"testkey1", "ImageId"=>"image_id1"}}}}.to_json
+      cloud.template(:resources => [ec2, ec2_1, elb], :description => 'test template').should == {"AWSTemplateFormatVersion"=>"2010-09-09", 
+        "Description"=>"test template",
+        "Resources"=>{
+          "name"=>{
+            "Type"=>"AWS::EC2::Instance",
+            "Properties"=>{
+              "KeyName"=>"testkey",
+              "ImageId"=>"image_id"}
+            },
+           "name1"=>{
+             "Type"=>"AWS::EC2::Instance",
+             "Properties"=>{
+                "KeyName"=>"testkey1", 
+                "ImageId"=>"image_id1"
+                 }
+            },
+           "ELB" => {
+              "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" => "name"}, {"Ref" => "name1"}]}
+            }
+          }
+      }.to_json
     end
   end
 
@@ -28,9 +67,10 @@ describe Cloudster::Cloud do
       cloud_formation = double('CloudFormation')
       Fog::AWS::CloudFormation.should_receive(:new).with(:aws_access_key_id => 'test', :aws_secret_access_key => 'test').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'])
       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], :description => 'testDescription'))
-      cloud.provision(:resources => [ec2], :stack_name => 'stack_name', :description => 'testDescription')
+      cloud_formation.should_receive('create_stack').with('stack_name', 'TemplateBody' => cloud.template(:resources => [ec2, elb], :description => 'testDescription'))
+      cloud.provision(:resources => [ec2, elb], :stack_name => 'stack_name', :description => 'testDescription')
     end
   end
 

data/spec/elb_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Cloudster::Elb do
+  describe 'initialize' do
+    it "should raise argument error if no argument is not provided" do
+      expect { Cloudster::Elb.new() }.to raise_error(ArgumentError, 'Missing required argument: name,instance_names')
+    end
+    it "should not raise argument error if all arguments are provided" do
+      expect { Cloudster::Elb.new(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2']) }.to_not raise_error
+    end
+  end
+  describe '#template' do
+    it "should return a ruby hash for the resource cloudformation template" 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"}]}}}}
+    end
+  end
+  describe '.template' do
+    it "should raise argument error if no argument is not provided" do
+      expect { Cloudster::Elb.template() }.to raise_error(ArgumentError, 'Missing required argument: name,instance_names')
+    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"}]}}}}
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -143,9 +143,11 @@ files:
 - lib/cloudster.rb
 - lib/cloudster/cloud.rb
 - lib/cloudster/ec2.rb
+- lib/cloudster/elb.rb
 - lib/cloudster/options_manager.rb
 - spec/cloud_spec.rb
 - spec/ec2_spec.rb
+- spec/elb_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/emilsoman/cloudster
 licenses:
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -972857553
+      hash: -954846317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: