cloudster 2.7.0 → 2.8.0

data/README.md

@@ -15,7 +15,8 @@ Create AWS resources :
     app_server = Cloudster::Ec2.new(:name => 'AppServer',
       :key_name => 'mykey',
       :image_id => 'ami_image_id',
-      :instance_type => 't1.micro'
+      :instance_type => 't1.micro',
+      :security_groups => ["TopSecurityGroup"]
     )
 
     chef_client = Cloudster::ChefClient.new(

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.8.0

data/cloudster.gemspec

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

@@ -13,7 +13,8 @@ module Cloudster
     #    :name => 'AppServer',
     #    :key_name => 'mykey',
     #    :image_id => 'ami_image_id',
-    #    :instance_type => 't1.micro'
+    #    :instance_type => 't1.micro',
+    #    :security_groups => ["TopSecurityGroup"]
     #   )
     #
     # ==== Parameters
@@ -22,12 +23,14 @@ module Cloudster
     #     * :key_name: String containing the name of the keypair to be used for SSH
     #     * :image_id: String containing the AMI image id to be used while creating the Ec2 resource
     #     * :instance_type: String containing instance type ( Example : t1.micro )
+    #     * :security_groups: Array containing names of existing SecurityGroups already defined using AWS console
     def initialize(options = {})
       require_options(options, [:name, :key_name, :image_id])
       @name = options[:name]
       @key_name = options[:key_name]
       @image_id = options[:image_id]
       @instance_type = options[:instance_type]
+      @security_groups = options[:security_groups]
     end
 
     # Returns a Ruby hash version of the Cloud Formation template for the resource instance
@@ -37,14 +40,15 @@ module Cloudster
     #    :name => 'AppServer',
     #    :key_name => 'mykey',
     #    :image_id => 'ami_image_id',
-    #    :instance_type => 't1.micro'
+    #    :instance_type => 't1.micro',
+    #    :security_groups => ["SecurityGroup"]
     #   )
     #   ec2.template
     #
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template for the resource instance
     def template
-      @template ||= Ec2.template({:name =>@name, :key_name => @key_name, :image_id => @image_id, :instance_type => @instance_type})
+      @template ||= Ec2.template({:name =>@name, :key_name => @key_name, :image_id => @image_id, :instance_type => @instance_type, :security_groups => @security_groups})
     end
 
     # Class method that returns a Ruby hash version of the Cloud Formation template
@@ -64,6 +68,7 @@ module Cloudster
     #     * :key_name: String containing the name of the keypair to be used for SSH
     #     * :image_id: String containing the AMI image id to be used while creating the Ec2 resource
     #     * :instance_type: String containing instance type ( Example : t1.micro )
+    #     * :security_groups: Array containing names of existing SecurityGroups already defined using AWS console
     #
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template
@@ -72,6 +77,10 @@ module Cloudster
       properties = {}
       properties.merge!({"KeyName" => options[:key_name], "ImageId" => options[:image_id]})
       properties.merge!({"InstanceType" => options[:instance_type]}) unless options[:instance_type].nil?
+      unless options[:security_groups].nil?
+        security_groups = options[:security_groups].to_a
+        properties.merge!({"SecurityGroups" => security_groups})
+      end
       template = {'Resources' => { 
                         options[:name] => { 
                           'Type' => 'AWS::EC2::Instance',

data/spec/ec2_spec.rb

@@ -14,8 +14,9 @@ describe Cloudster::Ec2 do
   end
   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' )
-      ec2.template.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id', "InstanceType" => 't1.micro'} }}}
+      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"]} }}}
+      puts ec2.template.to_json
     end
   end
   describe '.template' do
@@ -23,8 +24,8 @@ describe Cloudster::Ec2 do
       expect { Cloudster::Ec2.template() }.to raise_error(ArgumentError, 'Missing required argument: name,key_name,image_id')
     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')
-      hash.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id', "InstanceType" => 't1.micro'} }}}
+      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"]} }}}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 991965789
+      hash: -464146239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: