cloudster 2.0.0 → 2.1.0

data/README.md

@@ -16,7 +16,8 @@ Create AWS EC2 resources as shown here:
 
     app_server = Cloudster::Ec2.new(:name => 'AppServer',
       :key_name => 'mykey',
-      :image_id => 'ami_image_id'
+      :image_id => 'ami_image_id',
+      :instance_type => 't1.micro'
     )
     app_server_2 = Cloudster::Ec2.new(:name => 'AppServer',
       :key_name => 'mykey',

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/cloudster.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]

data/lib/cloudster/ec2.rb

@@ -11,7 +11,8 @@ module Cloudster
     #   ec2 = Cloudster::Ec2.new(
     #    :name => 'AppServer',
     #    :key_name => 'mykey',
-    #    :image_id => 'ami_image_id'
+    #    :image_id => 'ami_image_id',
+    #    :instance_type => 't1.micro'
     #   )
     #
     # ==== Parameters
@@ -19,11 +20,13 @@ module Cloudster
     #     * :name: String containing the name for the Ec2 resource
     #     * :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 )
     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]
     end
 
     # Returns a Ruby hash version of the Cloud Formation template for the resource instance
@@ -32,14 +35,15 @@ module Cloudster
     #   ec2 = Cloudster::Ec2.new(
     #    :name => 'AppServer',
     #    :key_name => 'mykey',
-    #    :image_id => 'ami_image_id'
+    #    :image_id => 'ami_image_id',
+    #    :instance_type => 't1.micro'
     #   )
     #   ec2.template
     #
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template for the resource instance
     def template
-      Ec2.template({:name =>@name, :key_name => @key_name, :image_id => @image_id})
+      Ec2.template({:name =>@name, :key_name => @key_name, :image_id => @image_id, :instance_type => @instance_type})
     end
 
     # Class method that returns a Ruby hash version of the Cloud Formation template
@@ -48,7 +52,8 @@ module Cloudster
     #   template = Cloudster::Ec2.template(
     #    :name => 'AppServer',
     #    :key_name => 'mykey',
-    #    :image_id => 'ami_image_id'
+    #    :image_id => 'ami_image_id',
+    #    :instance_type => 't1.micro'
     #   )
     #
     # ==== Parameters
@@ -57,20 +62,21 @@ module Cloudster
     #     * :name: String containing the name for the Ec2 resource
     #     * :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 )
     #
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template
     def self.template(options = {})
       require_options(options, [:name, :key_name, :image_id])
+      properties = {}
+      properties.merge!({"KeyName" => options[:key_name], "ImageId" => options[:image_id]})
+      properties.merge!({"InstanceType" => options[:instance_type]}) unless options[:instance_type].nil?
       template = {'Resources' => { 
                         options[:name] => { 
                           'Type' => 'AWS::EC2::Instance',
-                          'Properties' => { 
-                            "KeyName" => options[:key_name],
-                            "ImageId" => options[:image_id]
-                           }
-                         }
+                          'Properties' => properties
                        }
+                  }
       }
       return template 
     end

data/spec/ec2_spec.rb

@@ -9,13 +9,13 @@ describe Cloudster::Ec2 do
       expect { Cloudster::Ec2.new() }.to raise_error(ArgumentError, 'Missing required argument: name,key_name,image_id')
     end
     it "should not raise argument error if all arguments are provided" do
-      expect { Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', name: 'name') }.to_not raise_error
+      expect { Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name', :instance_type => 't1.micro') }.to_not raise_error
     end
   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')
-      ec2.template.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id'} }}}
+      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'} }}}
     end
   end
   describe '.template' do
@@ -23,8 +23,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')
-      hash.should == {'Resources' => {'name' => {'Type' => 'AWS::EC2::Instance', 'Properties' => {"KeyName" => 'testkey', "ImageId" => 'image_id'} }}}
+      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'} }}}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -639543533
+      hash: -644821325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: