cloudster 2.5.0 → 2.6.0

data/Gemfile.lock

@@ -3,10 +3,10 @@ GEM
   specs:
     builder (3.1.4)
     diff-lcs (1.1.3)
-    excon (0.14.2)
-    fog (1.4.0)
+    excon (0.16.8)
+    fog (1.7.0)
       builder
-      excon (~> 0.14.0)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -14,7 +14,7 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.3)
+    formatador (0.2.4)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -23,22 +23,22 @@ GEM
       rdoc
     json (1.7.5)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.6.1)
     nokogiri (1.5.5)
-    rake (0.9.2.2)
+    rake (10.0.1)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
     ruby-hmac (0.4.0)
 
 PLATFORMS

data/README.md

@@ -1,7 +1,8 @@
 # Cloudster [![Build Status](https://travis-ci.org/emilsoman/cloudster.png)](https://travis-ci.org/emilsoman/cloudster) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/emilsoman/cloudster) [![Dependency Status](https://gemnasium.com/emilsoman/cloudster.png)](https://gemnasium.com/emilsoman/cloudster)
 
-Cloudster exposes simple helper methods to provision your AWS cloud.
-Cloudster uses the AWS APIs to provision stacks on Amazon Cloud.
+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 !
 
 ##Installation
 
@@ -9,7 +10,7 @@ Cloudster uses the AWS APIs to provision stacks on Amazon Cloud.
 
 ## Usage
 
-Create AWS resources as shown here:
+Create AWS resources :
 
     app_server = Cloudster::Ec2.new(:name => 'AppServer',
       :key_name => 'mykey',
@@ -20,7 +21,9 @@ Create AWS resources as shown here:
     chef_client = Cloudster::ChefClient.new(
      :validation_key => 'asd3e33880889098asdnmnnasd8900890a8sdmasdjna9s880808asdnmnasd90-a',
      :server_url => 'http://10.50.60.70:4000',
-     :node_name => 'project.environment.appserver_1'
+     :node_name => 'project.environment.appserver_1',
+     :environment => 'production',
+     :interval => 1800
     )
 
     chef_client.add_to(app_server)
@@ -32,7 +35,8 @@ Create AWS resources as shown here:
 
     #Add your app servers to the ElasticLoadBalancer
     load_balancer = Cloudster::Elb.new(:name => 'LoadBalancer',
-      :instance_names => ['AppServer', 'AppServer2']
+      :instance_names => ['AppServer', 'AppServer2'],
+      :listeners => [{:port => 80, :instance_port => 8080, :protocol => 'HTTP'}]
     )
 
     database = Cloudster::Rds.new(
@@ -48,13 +52,16 @@ 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 :
+Get the CloudFormation template for the stack :
     
         cloud.template(:resources => [app_server, app_server_2, load_balancer, database], :description => 'Description of the stack')
-    
+
+Get the CloudFormation template for a resource as a Ruby Hash :
+
+        app_server.template
+ 
+Cloudster can also do things on the AWS Cloud :
+
 - Provision the stack :
 
         cloud.provision(:resources => [app_server, app_server_2, load_balancer, database], :stack_name => 'TestStack', :description => 'Description of the stack')
@@ -67,10 +74,58 @@ Make a cloud :
 
         cloud.delete(:stack_name => 'TestStack')
 
-- Describe the events of a stack using :
+- Describe the events of a stack :
 
         cloud.events(:stack_name => 'TestStack')
 
+----------------
+
+# Contribute !
+
+Got some love for Cloudster? That's great!
+
+## Found a bug?
+
+Log the bug in the [issue tracker](https://github.com/emilsoman/cloudster/issues). Be sure to include all relevant information, like
+the versions of Cloudster and Ruby you're using. A [gist](http://gist.github.com/)
+of the code that caused the issue as well as any error messages are also very
+helpful.
+
+## Need help?
+
+You can use the [Issues](https://github.com/emilsoman/cloudster/issues) page to ask a new question. This is how you do it: 
+1. Click on New Issue
+2. Type in your question
+3. Add a "question" label to the issue
+
+## Have a patch?
+
+Bugs and feature requests that include patches are much more likely to
+get attention. Here are some guidelines that will help ensure your patch
+can be applied as quickly as possible:
+
+1. **Use [Git](http://git-scm.com) and [GitHub](http://github.com):**
+   The easiest way to get setup is to fork the
+   [cloudster repo](http://github.com/emilsoman/cloudster/).
+
+2. **Write unit tests:** If you add or modify functionality, it must
+   include unit tests. I use RSpec to test cloudster. If you are not an
+   RSpec expert, if you let me know, I can help you write the specs.
+
+3. **Update the `README`:** If the patch adds or modifies a major feature,
+   modify the `README.md` file to reflect that. Again if you're not an
+   expert with Markdown syntax, it's really easy to learn. Check out [Dillinger](http://dillinger.io/) to
+   try it out.
+
+4. **Push it:** Once you're ready, push your changes to a topic branch
+   and add a note to the ticket with the URL to your branch. Or, say
+   something like, "you can find the patch on johndoe/foobranch". I also
+   gladly accept Github [pull requests](http://help.github.com/pull-requests/).
+
+__NOTE:__ _I will take in whatever I can get._ If you prefer to
+attach diffs in comments on issues, that's fine; but do know
+that _someone_ will need to take the diff through the process described
+above and this can hold things up considerably.
 
 
 ##License
@@ -78,4 +133,3 @@ Make a cloud :
 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.5.0
+2.6.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.5.0"
+  s.version = "2.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2012-11-09"
+  s.date = "2012-11-16"
   s.description = "Cloudster uses the AWS APIs to provision stacks on Amazon Cloud."
   s.email = "emil.soman@gmail.com"
   s.extra_rdoc_files = [

data/lib/cloudster/chef_client.rb

@@ -5,14 +5,14 @@ module Cloudster
     # Initialize an ChefClient configuration
     #
     # ==== Notes
-    # options parameter must include values for :instance_name, :validation_key, :server_url and :node_name
+    # options parameter must include values for :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'
+    #    :node_name => 'project.environment.appserver_1',
+    #    :interval => 1800
     #   )
     #
     # ==== Parameters
@@ -21,11 +21,13 @@ module Cloudster
     #     * :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
+    #     * :interval: Integer containing the interval(in seconds) between chef-client runs. Degault value : 1800 seconds
     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]
+      @interval = options[:interval] || 1800
     end
 
     # Merges the required CloudFormation template for installing the Chef Client to the template of the EC2 instance
@@ -97,25 +99,20 @@ module Cloudster
                 "cat << EOF > /etc/chef/solo.rb\n",
                 "file_cache_path \"/tmp/chef-solo\"\n",
                 "cookbook_path \"/tmp/chef-solo/cookbooks\"\n",
+                "node_name \"#{@node_name}\"\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",
+                "\"chef_client\": {\n",
+                "  \"server_url\": \"#{@server_url}\",\n",
+                "  \"interval\": \"#{@interval}\"\n",
                 "},\n",
                 "\"run_list\": [\"recipe[chef-client::config]\", \"recipe[chef-client]\"]\n",
                 "}\n",
                 "EOF\n",
-
+                "echo \"#{@validation_key}\" > /etc/chef/validation.pem\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"
+                "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"
             ]]}}
             }
           }

data/lib/cloudster/elb.rb

@@ -10,17 +10,20 @@ module Cloudster
     # ==== Examples
     #   elb = Cloudster::Elb.new(
     #    :name => 'LoadBalancer',
-    #    :instance_names => ['AppServer1','AppServer2']
+    #    :instance_names => ['AppServer1','AppServer2'],
+    #    :listeners => [{:port => 80, :instance_port => 8080, :protocol => 'HTTP'}]
     #   )
     #
     # ==== 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
+    #     * :listeners: Array of listener hashes. Each listener must be registered for a specific port, and you can not have more than one listener for a given port. Default : {:port => 80, :instance_port => 80, :protocol => 'HTTP'}
     def initialize(options = {})
       require_options(options, [:name, :instance_names])
       @name = options[:name]
       @instance_names = options[:instance_names]
+      @listeners = options[:listeners] || [{:port => 80, :instance_port => 80, :protocol => 'HTTP'}]
     end
 
     # Returns a Ruby hash version of the Cloud Formation template for the resource instance
@@ -35,7 +38,7 @@ module Cloudster
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template for the resource instance
     def template
-      Elb.template({:name =>@name, :instance_names => @instance_names})
+      Elb.template({:name =>@name, :instance_names => @instance_names, :listeners => @listeners})
     end
 
     # Class method that returns a Ruby hash version of the Cloud Formation template
@@ -43,7 +46,8 @@ module Cloudster
     # ==== Examples
     #   template = Cloudster::Elb.template(
     #    :name => 'LoadBalances',
-    #    :instance_names => ['AppServer1', 'AppServer2']
+    #    :instance_names => ['AppServer1', 'AppServer2'],
+    #    :listeners => [{:port => 80, :instance_port => 80, :protocol => 'HTTP'}]
     #   )
     #
     # ==== Parameters
@@ -51,16 +55,13 @@ module Cloudster
     #   *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
-    #
+    #     * :listeners: Array of listener hashes. Each listener must be registered for a specific port, and you can not have more than one listener for a given port. Default : {:port => 80, :instance_port => 80, :protocol => 'HTTP'}
     # ==== 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"
-        }],
+        "Listeners" => get_listeners_for_template(options[:listeners]),
         "HealthCheck" => {
           "Target" => { "Fn::Join" => [ "", ["HTTP:", "80", "/"]]},
           "HealthyThreshold" => "3",
@@ -90,5 +91,19 @@ module Cloudster
         return instance_list
       end
 
+      #Get listeners array for template
+      def self.get_listeners_for_template(listeners)
+        default_listener = [{:port => 80, :instance_port => 80, :protocol => 'HTTP'}]
+        listeners = default_listener if listeners.nil?
+        listener_array = []
+        listeners.each do |listener|
+          listener_array << { "LoadBalancerPort" => "#{listener[:port]}",
+            "InstancePort" => "#{listener[:instance_port]}",
+            "Protocol" => "#{listener[:protocol]}"
+          }
+        end
+        return listener_array
+      end
+
   end
 end

data/spec/chef_client_spec.rb

@@ -12,7 +12,7 @@ describe Cloudster::ChefClient do
   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 = Cloudster::ChefClient.new(:validation_key => 'somekey', :server_url => 'testurl', :node_name => 'uniquename', :interval => 30)
       chef_client.add_to ec2
       ec2.template.should == 
         {
@@ -26,28 +26,31 @@ describe Cloudster::ChefClient do
                 "UserData"=>{
                   "Fn::Base64"=>{
                     "Fn::Join"=>["", [
-                      "#!/bin/bash -v\n", 
-                      "function error_exit\n", 
-                      "{\n", "  exit 1\n", "}\n",
+                      "#!/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",
+                      "node_name \"uniquename\"\n",
+                      "EOF\n",
+                      "cat << EOF > /etc/chef/chef.json\n",
+                      "{\n",
+                      "\"chef_client\": {\n",
+                      "  \"server_url\": \"testurl\",\n",
+                      "  \"interval\": \"30\"\n",
                       "},\n",
                       "\"run_list\": [\"recipe[chef-client::config]\", \"recipe[chef-client]\"]\n",
                       "}\n",
                       "EOF\n",
+                      "echo \"somekey\" > /etc/chef/validation.pem\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"
+                      "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"
+
                     ]]
                   }
                 }

data/spec/elb_spec.rb

@@ -9,12 +9,18 @@ describe Cloudster::Elb 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
+  describe '#template with default listener' do
+    it "should return a ruby hash for the resource cloudformation template with default listener" 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 with custom listener' do
+    it "should return a ruby hash for the resource cloudformation template with the custom listener" do
+      elb = Cloudster::Elb.new(:name => 'LoadBalancer', :instance_names => ['AppServer', 'AppServer2'], :listeners => [{:port => 80, :instance_port => 3333, :protocol => 'HTTP'}]) 
+      elb.template.should == {"Resources" => {"LoadBalancer"=>{"Type"=>"AWS::ElasticLoadBalancing::LoadBalancer", "Properties"=>{"AvailabilityZones"=>{"Fn::GetAZs"=>""}, "Listeners"=>[{"LoadBalancerPort"=>"80", "InstancePort"=>"3333", "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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -233709777
+      hash: 239227311
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: