cloudster 2.15.0 → 2.16.0

data/Gemfile.lock

@@ -34,7 +34,7 @@ GEM
       highline (>= 1.6.15)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.6)
     jwt (0.1.5)
       multi_json (>= 1.0)
     mime-types (1.19)
@@ -43,7 +43,7 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.6.2)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
@@ -61,7 +61,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     ruby-hmac (0.4.0)
 
 PLATFORMS

data/README.md

@@ -2,7 +2,7 @@
 
 Cloudster is a Ruby gem that was born to cut the learning curve involved in writing your own CloudFormation templates. If you don't know what
 a CloudFormation template is, but know about the AWS Cloud offerings, you can still use cloudster to provision your stack. Still in infancy , cloudster
-can create a very basic stack like a breeze. All kinds of contribution welcome !
+can create a basic stack like a breeze. Checkout the Usage section for the supported features.
 
 ##Installation
 
@@ -26,7 +26,10 @@ Create AWS resources :
      :interval => 1800
     )
 
+    elastic_ip = Cloudster::ElasticIp.new
+
     chef_client.add_to(app_server)
+    elastic_ip.add_to(app_server)
 
     app_server_2 = Cloudster::Ec2.new(:name => 'AppServer2',
       :key_name => 'mykey',
@@ -40,17 +43,25 @@ Create AWS resources :
     )
 
     database = Cloudster::Rds.new(
-        :name => 'MySqlDB',
-        :instance_class => 'db.t1.micro',
-        :storage_class => '100',
-        :username => 'admin',
-        :password => 'admin123',
-        :engine => 'MySQL',
-        :multi_az => true
+      :name => 'MySqlDB',
+      :instance_class => 'db.t1.micro',
+      :storage_class => '100',
+      :username => 'admin',
+      :password => 'admin123',
+      :engine => 'MySQL',
+      :multi_az => true
     )
 
     storage = Cloudster::S3.new(
-        :name => 'MyBucket'
+      :name => 'MyBucket'
+    )
+
+    elasticache = Cloudster::ElastiCache.new(
+      :name => 'CacheResource',
+      :node_type => 'cache.t1.micro',
+      :cache_security_group_names => ['default'],
+      :engine => 'memcached',
+      :node_count => 3
     )
 
 Make a cloud :
@@ -59,7 +70,7 @@ Make a cloud :
 
 Get the CloudFormation template for the stack :
 
-        cloud.template(:resources => [app_server, app_server_2, load_balancer, database], :description => 'Description of the stack')
+        cloud.template(:resources => [app_server, app_server_2, load_balancer, database, storage, elasticache], :description => 'Description of the stack')
 
 Get the CloudFormation template for a resource as a Ruby Hash :
 
@@ -121,11 +132,15 @@ Cloudster can also do things on the AWS Cloud :
 
 - ### More coming soon ..
 
+I'm trying to add every AWS resource to cloudster, one by one. If you don't find what you need,
+let me know and I'll try to get the feature included ASAP, or you can submit a pull request with the feature -
+that would be awesome! Or, you can patiently wait till the feature is added to cloudster.
+
 ----------------
 
-# Contribute !
+# Contribute
 
-Got some love for Cloudster? That's great!
+Got some love for Cloudster? Sweet!
 
 ## Found a bug?
 
@@ -174,4 +189,8 @@ above and this can hold things up considerably.
 
 MIT
 
+## Thanks
+
+To Sinatra README for having a nice 'Contribute' section which I'm using(with minor changes) for Cloudster.
+
 *Free Software, Forever . YEAH !*

data/VERSION

@@ -1 +1 @@
-2.15.0
+2.16.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.15.0"
+  s.version = "2.16.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2012-12-30"
+  s.date = "2012-12-31"
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/cloudster/cloud.rb",
     "lib/cloudster/deep_merge.rb",
     "lib/cloudster/ec2.rb",
+    "lib/cloudster/elastic_ip.rb",
     "lib/cloudster/elasticache.rb",
     "lib/cloudster/elb.rb",
     "lib/cloudster/options_manager.rb",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
     "spec/chef_client_spec.rb",
     "spec/cloud_spec.rb",
     "spec/ec2_spec.rb",
+    "spec/elastic_ip_spec.rb",
     "spec/elasticache_spec.rb",
     "spec/elb_spec.rb",
     "spec/rds_spec.rb",

data/lib/cloudster.rb

@@ -12,3 +12,4 @@ require 'cloudster/s3'
 require 'cloudster/elasticache'
 require 'cloudster/cloud'
 require 'cloudster/chef_client'
+require 'cloudster/elastic_ip'

data/lib/cloudster/chef_client.rb

@@ -16,8 +16,7 @@ module Cloudster
     #   )
     #
     # ==== Parameters
-    # * options<~Hash> - 
-    #     * :instance_name: String containing the name of EC2 element on which chef-client is to be bootstrapped. Mandatory field
+    # * options<~Hash> -
     #     * :validation_key: String containing the key used for validating this client with the server. This can be taken from the chef-server validation.pem file. Mandatory field
     #     * :server_url: String containing the fully qualified domain name of the chef-server. Mandatory field
     #     * :node_name: String containing the name for the chef node. It has to be unique across all nodes in the particular chef client-server ecosystem. Mandatory field
@@ -35,7 +34,6 @@ module Cloudster
     #
     # ==== Examples
     #   chef_client = Cloudster::ChefClient.new(
-    #    :instance_name => 'AppServer',
     #    :validation_key => 'asd3e33880889098asdnmnnasd8900890a8sdmasdjna9s880808asdnmnasd90-a',
     #    :server_url => 'http://10.50.60.70:4000',
     #    :node_name => 'project.environment.appserver_1'
@@ -53,13 +51,12 @@ module Cloudster
     # * instance of EC2
     def add_to(ec2)
       ec2_template = ec2.template
-      @instance_name = ec2.name 
+      @instance_name = ec2.name
       chef_client_template = template
       ec2.template.deep_merge(chef_client_template)
     end
 
     private
-      
       def template
         return "Resources" => {
           @instance_name => {

data/lib/cloudster/elastic_ip.rb

@@ -0,0 +1,59 @@
+module Cloudster
+  #==ElasticIp resource
+  class ElasticIp
+
+    # Initialize an ElasticIp
+    #
+    # ==== Notes
+    # options parameter must include values for :name
+    #
+    # ==== Examples
+    #   elastic_ip = Cloudster::ElasticIp.new(:name => 'ElasticIp')
+    #
+    # ==== Parameters
+    # * options<~Hash> -
+    #     * :name: String containing the name of ElastiCache resource
+    def initialize(options = {})
+      require_options(options, [:name])
+      @name = options[:name]
+    end
+
+    # Merges the required CloudFormation template for adding an ElasticIp to an EC2 instance
+    #
+    #
+    # ==== Examples
+    #   elastic_ip = Cloudster::ElasticIp.new(:name => 'AppServerEIp')
+    #   ec2 = Cloudster::Ec2.new(
+    #    :name => 'AppServer',
+    #    :key_name => 'mykey',
+    #    :image_id => 'ami_image_id',
+    #    :instance_type => 't1.micro'
+    #   )
+    #
+    #   elastic_ip.add_to ec2
+    #
+    # ==== Parameters
+    # * instance of EC2
+    def add_to(ec2)
+      ec2_template = ec2.template
+      @instance_name = ec2.name
+      elastic_ip_template = template
+      ec2.template.deep_merge(elastic_ip_template)
+    end
+
+    private
+      def template
+        return "Resources" => {
+          @name => {
+            "Type" => "AWS::EC2::EIP",
+              "Properties" => {
+                "InstanceId" => {
+                  "Ref" => @instance_name
+                }
+              }
+          }
+        }
+      end
+
+  end
+end

data/lib/cloudster/elasticache.rb

@@ -21,7 +21,7 @@ module Cloudster
    #    :node_type => 'cache.t1.micro',
    #    :cache_security_group_names => ['default'],
    #    :engine => 'memcached',
-   #    :node_count => 3"
+   #    :node_count => 3
    #   )
 
    def initialize(options = {})
@@ -41,7 +41,7 @@ module Cloudster
    #    :node_type => 'cache.t1.micro',
    #    :cache_security_group_names => ['default'],
    #    :engine => 'memcached',
-   #    :node_count => 3"
+   #    :node_count => 3
    #   )
    #   elasticache.template
    #

data/spec/elastic_ip_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Cloudster::ChefClient do
+  describe 'initialize' do
+    it "should raise argument error if no argument is not provided" do
+      expect { Cloudster::ElasticIp.new() }.to raise_error(ArgumentError, 'Missing required argument: name')
+    end
+    it "should not raise argument error if all arguments are provided" do
+      expect { Cloudster::ElasticIp.new(:name => 'ElasticIp') }.to_not raise_error
+    end
+  end
+  describe '#add_to' do
+    it "should add elastic ip configuration to ec2 template" do
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'AppServer', :instance_type => 't1.micro' )
+      elastic_ip = Cloudster::ElasticIp.new(:name => 'ElasticIp')
+      elastic_ip.add_to ec2
+      ec2.template.should ==
+        {
+          "Resources"=>{
+            "AppServer"=>{
+              "Type"=>"AWS::EC2::Instance",
+              "Properties"=>{
+                "KeyName"=>"testkey",
+                "ImageId"=>"image_id",
+                "InstanceType"=>"t1.micro",
+              }
+            },
+            "ElasticIp"=>{
+              "Type"=>"AWS::EC2::EIP",
+              "Properties"=>{
+                "InstanceId"=> {
+                  "Ref" => "AppServer"
+                }
+              }
+            }
+          }
+        }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -134,6 +134,7 @@ files:
 - lib/cloudster/cloud.rb
 - lib/cloudster/deep_merge.rb
 - lib/cloudster/ec2.rb
+- lib/cloudster/elastic_ip.rb
 - lib/cloudster/elasticache.rb
 - lib/cloudster/elb.rb
 - lib/cloudster/options_manager.rb
@@ -142,6 +143,7 @@ files:
 - spec/chef_client_spec.rb
 - spec/cloud_spec.rb
 - spec/ec2_spec.rb
+- spec/elastic_ip_spec.rb
 - spec/elasticache_spec.rb
 - spec/elb_spec.rb
 - spec/rds_spec.rb
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 761406417
+      hash: 648278835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: