cloudster 2.4.0 → 2.5.0

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+before_install:
+  - gem install nokogiri -- --with-cflags='--std=gnu99'
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree

data/Gemfile

@@ -12,5 +12,4 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler"
   gem "jeweler", "~> 1.8.4"
-  gem "debugger"
 end

data/Gemfile.lock

@@ -2,14 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.1.4)
-    columnize (0.3.6)
-    debugger (1.2.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
     diff-lcs (1.1.3)
     excon (0.14.2)
     fog (1.4.0)
@@ -54,7 +46,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  debugger
   fog
   jeweler (~> 1.8.4)
   json

data/README.md

@@ -3,58 +3,74 @@
 Cloudster exposes simple helper methods to provision your AWS cloud.
 Cloudster uses the AWS APIs to provision stacks on Amazon Cloud.
 
-
-- This gem is under active development. Currently supports only a basic EC2 resource .
-
 ##Installation
 
     gem install cloudster
 
 ## Usage
 
-Create AWS EC2 resources as shown here:
+Create AWS resources as shown here:
 
     app_server = Cloudster::Ec2.new(:name => 'AppServer',
       :key_name => 'mykey',
       :image_id => 'ami_image_id',
       :instance_type => 't1.micro'
     )
+
+    chef_client = Cloudster::ChefClient.new(
+     :validation_key => 'asd3e33880889098asdnmnnasd8900890a8sdmasdjna9s880808asdnmnasd90-a',
+     :server_url => 'http://10.50.60.70:4000',
+     :node_name => 'project.environment.appserver_1'
+    )
+
+    chef_client.add_to(app_server)
+
     app_server_2 = Cloudster::Ec2.new(:name => 'AppServer2',
       :key_name => 'mykey',
       :image_id => 'ami_image_id'
     )
+
+    #Add your app servers to the ElasticLoadBalancer
     load_balancer = Cloudster::Elb.new(:name => 'LoadBalancer',
       :instance_names => ['AppServer', 'AppServer2']
     )
 
-Create a stack out of the resources :
+    database = Cloudster::Rds.new(
+        :name => 'MySqlDB',
+        :instance_class => 'db.t1.micro',
+        :storage_class => '100',
+        :username => 'admin',
+        :password => 'admin123',
+        :engine => 'MySQL'
+    )
 
-    stack = Cloudster::Cloud.new(:access_key_id => 'accesskeyid',
-                                :secret_access_key => 'topsecretaccesskey')
-Now you can do stuff like :
+Make a cloud :
+
+    cloud = Cloudster::Cloud.new(:access_key_id => 'accesskeyid', :secret_access_key => 'topsecretaccesskey')
 
 - Get the CloudFormation template for a resource in Ruby Hash :
     
         app_server.template
 - Get the CloudFormation template for the stack :
     
-        stack.template(:resources => [app_server, app_server_2, load_balancer], :description => 'Description of the stack')
+        cloud.template(:resources => [app_server, app_server_2, load_balancer, database], :description => 'Description of the stack')
     
 - Provision the stack :
 
-        stack.provision(:resources => [app_server, app_server_2, load_balancer], :stack_name => 'TestStack', :description => 'Description of the stack')
+        cloud.provision(:resources => [app_server, app_server_2, load_balancer, database], :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')
+        cloud.update(:resources => [app_server, app_server_2], :stack_name => 'TestStack', :description => 'Description of the stack')
+
+- Delete the stack and it's attached resources :
 
-- You can get the events of a stack using :
+        cloud.delete(:stack_name => 'TestStack')
 
-        stack.events(:stack_name => 'TestStack')
+- Describe the events of a stack using :
 
-- You can delete the stack and it's attached resources :
+        cloud.events(:stack_name => 'TestStack')
 
-        stack.delete(:stack_name => 'TestStack')
 
 
 ##License
@@ -62,3 +78,4 @@ Now you can do stuff like :
 MIT
 
 *Free Software, Forever . YEAH !*
+[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/eafd00c3c74c7362ed850f6a50120c30 "githalytics.com")](http://githalytics.com/emilsoman/cloudster)

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.5.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.4.0"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2012-10-31"
+  s.date = "2012-11-09"
   s.description = "Cloudster uses the AWS APIs to provision stacks on Amazon Cloud."
   s.email = "emil.soman@gmail.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,11 +28,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "cloudster.gemspec",
     "lib/cloudster.rb",
+    "lib/cloudster/chef_client.rb",
     "lib/cloudster/cloud.rb",
+    "lib/cloudster/deep_merge.rb",
     "lib/cloudster/ec2.rb",
     "lib/cloudster/elb.rb",
     "lib/cloudster/options_manager.rb",
     "lib/cloudster/rds.rb",
+    "spec/chef_client_spec.rb",
     "spec/cloud_spec.rb",
     "spec/ec2_spec.rb",
     "spec/elb_spec.rb",
@@ -54,7 +58,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<debugger>, [">= 0"])
     else
       s.add_dependency(%q<fog>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
@@ -62,7 +65,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
     s.add_dependency(%q<fog>, [">= 0"])
@@ -71,7 +73,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<debugger>, [">= 0"])
   end
 end
 

data/lib/cloudster.rb

@@ -3,8 +3,10 @@
 require 'json'
 require 'fog'
 require 'cloudster/options_manager'
+require 'cloudster/deep_merge'
 include OptionsManager
 require 'cloudster/ec2'
 require 'cloudster/elb'
 require 'cloudster/rds'
 require 'cloudster/cloud'
+require 'cloudster/chef_client'

data/lib/cloudster/chef_client.rb

@@ -0,0 +1,126 @@
+module Cloudster
+  #==UserData for Chef Client bootstrap
+  class ChefClient
+
+    # Initialize an ChefClient configuration
+    #
+    # ==== Notes
+    # options parameter must include values for :instance_name, :validation_key, :server_url and :node_name
+    #
+    # ==== 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'
+    #   )
+    #
+    # ==== Parameters
+    # * options<~Hash> - 
+    #     * :instance_name: String containing the name of EC2 element on which chef-client is to be bootstrapped. Mandatory field
+    #     * :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
+    def initialize(options = {})
+      require_options(options, [:validation_key, :server_url, :node_name])
+      @validation_key = options[:validation_key]
+      @server_url = options[:server_url]
+      @node_name = options[:node_name]
+    end
+
+    # Merges the required CloudFormation template for installing the Chef Client to the template of the EC2 instance
+    #
+    #
+    # ==== 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'
+    #   )
+    #   ec2 = Cloudster::Ec2.new(
+    #    :name => 'AppServer',
+    #    :key_name => 'mykey',
+    #    :image_id => 'ami_image_id',
+    #    :instance_type => 't1.micro'
+    #   )
+    #
+    #   chef_client.add_to ec2
+    #
+    # ==== Parameters
+    # * instance of EC2
+    def add_to(ec2)
+      ec2_template = ec2.template
+      @instance_name = ec2.name 
+      chef_client_template = template
+      ec2.template.deep_merge(chef_client_template)
+    end
+
+    private
+      
+      def template
+        return "Resources" => {
+          @instance_name => {
+            "Metadata" => {
+              "AWS::CloudFormation::Init" => {
+                "config" => {
+                  "packages" => {
+                    "rubygems" => {
+                      "chef" => [],
+                      "ohai" => []
+                     },
+                    "apt" => {
+                       "ruby"            => [],
+                       "ruby-dev"        => [],
+                       "libopenssl-ruby" => [],
+                       "rdoc"            => [],
+                       "ri"              => [],
+                       "irb"             => [],
+                       "build-essential" => [],
+                       "wget"            => [],
+                       "ssl-cert"        => [],
+                       "rubygems"        => []
+                    }
+                  }
+                }
+              }
+            },
+            "Properties"=> {
+              "UserData" => { "Fn::Base64" => { "Fn::Join" => ["", [
+                "#!/bin/bash -v\n",
+                "function error_exit\n",
+                "{\n",
+                "  exit 1\n",
+                "}\n",
+
+                "mkdir /etc/chef\n",
+                "cat << EOF > /etc/chef/solo.rb\n",
+                "file_cache_path \"/tmp/chef-solo\"\n",
+                "cookbook_path \"/tmp/chef-solo/cookbooks\"\n",
+                "EOF\n",
+                "cat << EOF > /etc/chef/chef.json\n",
+                "{\n",
+                "\"chef_server\": {\n",
+                "  \"server_url\": \"http://localhost:4000\",\n",
+                "  \"webui_enabled\": true,\n",
+                "  \"node_name\": \"#{@node_name}\"\n",
+                "},\n",
+                "\"run_list\": [\"recipe[chef-client::config]\", \"recipe[chef-client]\"]\n",
+                "}\n",
+                "EOF\n",
+
+                "# Bootstrap chef\n",
+                "chef-solo -c /etc/chef/solo.rb -j /etc/chef/chef.json -r http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz  > /tmp/chef_solo.log 2>&1 || error_exit 'Failed to bootstrap chef client'\n",
+
+                "# Fixup the server URL in client.rb\n",
+                "echo \"#{@validation_key}\" > /etc/chef/validation.pem 2>&1 || error_exit 'Failed to get Chef Server validation key'\n",
+                "sed -i 's|http://localhost:4000|", @server_url , "|g' /etc/chef/client.rb\n",
+                "chef-client -i 20 > /tmp/chef_client.log 2>&1 || error_exit 'Failed to initialize host via chef client' \n"
+            ]]}}
+            }
+          }
+        }
+      end
+
+  end
+end

data/lib/cloudster/deep_merge.rb

@@ -0,0 +1,10 @@
+# Stolen shamelessly from here http://apidock.com/rails/Hash/deep_merge!
+class Hash
+  def deep_merge(other_hash)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
+  end
+end

data/lib/cloudster/ec2.rb

@@ -2,6 +2,7 @@ module Cloudster
   #==Ec2 resource
   class Ec2
 
+    attr_accessor :template, :name
     # Initialize an Ec2 instance
     #
     # ==== Notes
@@ -43,7 +44,7 @@ module Cloudster
     # ==== 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, :instance_type => @instance_type})
+      @template ||= 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

data/lib/cloudster/options_manager.rb

@@ -1,5 +1,5 @@
 module OptionsManager
-  def require_options(options = {}, required_params)
+  def require_options(options, required_params)
     missing_args = []
     required_params.each do |param|
       missing_args << param.to_s if  options[param].nil?

data/spec/chef_client_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe Cloudster::ChefClient do
+  describe 'initialize' do
+    it "should raise argument error if no argument is not provided" do
+      expect { Cloudster::ChefClient.new() }.to raise_error(ArgumentError, 'Missing required argument: validation_key,server_url,node_name')
+    end
+    it "should not raise argument error if all arguments are provided" do
+      expect { Cloudster::ChefClient.new(:validation_key => 'somekey', :server_url => 'testurl', :node_name => 'uniquename') }.to_not raise_error
+    end
+  end
+  describe '#add_to' do
+    it "should add chef client configuration to ec2 template" do
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'AppServer', :instance_type => 't1.micro' )
+      chef_client = Cloudster::ChefClient.new(:validation_key => 'somekey', :server_url => 'testurl', :node_name => 'uniquename')
+      chef_client.add_to ec2
+      ec2.template.should == 
+        {
+          "Resources"=>{
+            "AppServer"=>{
+              "Type"=>"AWS::EC2::Instance",
+              "Properties"=>{
+                "KeyName"=>"testkey",
+                "ImageId"=>"image_id",
+                "InstanceType"=>"t1.micro",
+                "UserData"=>{
+                  "Fn::Base64"=>{
+                    "Fn::Join"=>["", [
+                      "#!/bin/bash -v\n", 
+                      "function error_exit\n", 
+                      "{\n", "  exit 1\n", "}\n",
+                      "mkdir /etc/chef\n",
+                      "cat << EOF > /etc/chef/solo.rb\n",
+                      "file_cache_path \"/tmp/chef-solo\"\n",
+                      "cookbook_path \"/tmp/chef-solo/cookbooks\"\n",
+                      "EOF\n", "cat << EOF > /etc/chef/chef.json\n",
+                      "{\n", "\"chef_server\": {\n",
+                      "  \"server_url\": \"http://localhost:4000\",\n",
+                      "  \"webui_enabled\": true,\n",
+                      "  \"node_name\": \"uniquename\"\n",
+                      "},\n",
+                      "\"run_list\": [\"recipe[chef-client::config]\", \"recipe[chef-client]\"]\n",
+                      "}\n",
+                      "EOF\n",
+                      "# Bootstrap chef\n",
+                      "chef-solo -c /etc/chef/solo.rb -j /etc/chef/chef.json -r http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz  > /tmp/chef_solo.log 2>&1 || error_exit 'Failed to bootstrap chef client'\n",
+                      "# Fixup the server URL in client.rb\n",
+                      "echo \"somekey\" > /etc/chef/validation.pem 2>&1 || error_exit 'Failed to get Chef Server validation key'\n",
+                      "sed -i 's|http://localhost:4000|", "testurl", "|g' /etc/chef/client.rb\n",
+                      "chef-client -i 20 > /tmp/chef_client.log 2>&1 || error_exit 'Failed to initialize host via chef client' \n"
+                    ]]
+                  }
+                }
+              },
+              "Metadata"=>{
+                "AWS::CloudFormation::Init"=>{
+                  "config"=>{
+                    "packages"=>{
+                      "rubygems"=>{
+                        "chef"=>[],
+                        "ohai"=>[]
+                      },
+                      "apt"=>{
+                        "ruby"=>[],
+                        "ruby-dev"=>[],
+                        "libopenssl-ruby"=>[],
+                        "rdoc"=>[],
+                        "ri"=>[],
+                        "irb"=>[],
+                        "build-essential"=>[],
+                        "wget"=>[],
+                        "ssl-cert"=>[],
+                        "rubygems"=>[]
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+    end
+  end
+end

data/spec/cloud_spec.rb

@@ -11,8 +11,8 @@ describe Cloudster::Cloud do
   end
   describe '#template' 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')
+      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')
       rds = Cloudster::Rds.new(:name => 'MySqlDB', :storage_size => '10') 
       elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['name','name1'])
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
@@ -70,14 +70,14 @@ describe Cloudster::Cloud do
 
   describe '#provision' do
     it "should raise argument error if resources not provided" do
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', name: 'name')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       expect { cloud.provision(:description => 'test') }.to raise_error(ArgumentError, 'Missing required argument: resources,stack_name' )
     end
     it "should trigger stack creation" 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')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
       elb = Cloudster::Elb.new(:name => 'ELB', :instance_names => ['name','name1'])
       rds = Cloudster::Rds.new(:name => 'MySqlDB', :storage_size => '10') 
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
@@ -88,14 +88,14 @@ describe Cloudster::Cloud do
 
   describe '#update' do
     it "should raise argument error if resources not provided" do
-      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', name: 'name')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       expect { cloud.update(:description => 'test') }.to raise_error(ArgumentError, 'Missing required argument: resources,stack_name' )
     end
     it "should trigger stack update" 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')
+      ec2 = Cloudster::Ec2.new(:key_name => 'testkey', :image_id => 'image_id', :name => 'name')
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
       cloud_formation.should_receive('update_stack').with('stack_name', 'TemplateBody' => cloud.template(:resources => [ec2], :description => 'testDescription'))
       cloud.update(:resources => [ec2], :stack_name => 'stack_name', :description => 'testDescription')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -107,22 +107,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Cloudster uses the AWS APIs to provision stacks on Amazon Cloud.
 email: emil.soman@gmail.com
 executables: []
@@ -133,6 +117,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -141,11 +126,14 @@ files:
 - VERSION
 - cloudster.gemspec
 - lib/cloudster.rb
+- lib/cloudster/chef_client.rb
 - lib/cloudster/cloud.rb
+- lib/cloudster/deep_merge.rb
 - lib/cloudster/ec2.rb
 - lib/cloudster/elb.rb
 - lib/cloudster/options_manager.rb
 - lib/cloudster/rds.rb
+- spec/chef_client_spec.rb
 - spec/cloud_spec.rb
 - spec/ec2_spec.rb
 - spec/elb_spec.rb
@@ -166,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380344941
+      hash: -233709777
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: