cloudster 2.19.6 → 2.19.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 714fdfb934ab6e43b39832bcb3b280415f208562
+  data.tar.gz: a8b009d410769dcbff93ffda190ad2851bcf7622
+SHA512:
+  metadata.gz: d441d0b8cee377c24ab15f4aff6ad048b123820a6e7e7be49f81387007f4aecb812dc29ff2f51aa7f8e61d2967cae8edd6fc34f315a77aa2bd7cfbc08c1fdc76
+  data.tar.gz: c1c4f004ff2c2606fbd9b08b73f0944e1bea0288ba6dc79a3d8336e2a889cd22486b8e24debae9d7dec3131609b3bc400bd27df29539fef0e4548169d23789e8

data/.travis.yml

@@ -4,4 +4,5 @@ before_install:
 rvm:
   - 1.9.3
   - 1.9.2
+  - 2.0.0
   - ruby-head

data/Gemfile

@@ -5,11 +5,15 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem "fog"
+gem "fog", "1.10.0"
 gem "json", "~>1.7.7"
 group :development do
-  gem "rspec"
   gem "rdoc"
   gem "bundler"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 1.8.7"
+end
+
+group :test do
+  gem "rspec"
+  gem 'coveralls', '>=0.5.7', :require => false
 end

data/Gemfile.lock

@@ -1,76 +1,97 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.1.4)
-    diff-lcs (1.1.3)
-    excon (0.16.10)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    fog (1.9.0)
+    addressable (2.3.5)
+    builder (3.2.2)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
+    excon (0.25.3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    fog (1.10.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
+      net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    git (1.2.5)
-    github_api (0.8.1)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
       faraday (~> 0.8.1)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.3)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    hashie (1.2.0)
-    highline (1.6.15)
+    hashie (2.0.5)
+    highline (1.6.19)
     httpauth (0.2.0)
-    jeweler (1.8.4)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
-      github_api (>= 0.8.1)
+      github_api (= 0.10.1)
       highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
     json (1.7.7)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
-    mime-types (1.20.1)
-    multi_json (1.5.0)
-    multipart-post (1.1.5)
-    net-scp (1.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mime-types (1.25)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.5)
-    nokogiri (1.5.6)
-    oauth2 (0.8.0)
+    net-ssh (2.6.8)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
       faraday (~> 0.8)
-      httpauth (~> 0.1)
+      httpauth (~> 0.2)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.4.4)
-    rake (10.0.3)
-    rdoc (3.12.1)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     ruby-hmac (0.4.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  fog
-  jeweler (~> 1.8.4)
+  coveralls (>= 0.5.7)
+  fog (= 1.10.0)
+  jeweler (~> 1.8.7)
   json (~> 1.7.7)
   rdoc
   rspec

data/README.md

@@ -1,7 +1,9 @@
 # Cloudster
 ### The fastest way to provision your AWS stack !
+[![Gem Version](https://badge.fury.io/rb/cloudster.png)](https://rubygems.org/gems/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)
+[![Coverage Status](https://coveralls.io/repos/emilsoman/cloudster/badge.png?branch=master)](https://coveralls.io/r/emilsoman/cloudster)
+[![Code Climate](https://codeclimate.com/github/emilsoman/cloudster.png)](https://codeclimate.com/github/emilsoman/cloudster)
 [![Dependency Status](https://gemnasium.com/emilsoman/cloudster.png)](https://gemnasium.com/emilsoman/cloudster)
 [![still maintained](http://stillmaintained.com/emilsoman/cloudster.png)](http://stillmaintained.com/emilsoman/cloudster)
 
@@ -242,5 +244,5 @@ MIT
 *Free Software, Forever . YEAH !*
 
 ## Thanks
-
+To [Fog](https://github.com/fog/fog) for making AWS APIs simple  
 To Sinatra README for having a nice 'Contribute' section which I'm using(with minor changes) for Cloudster.

data/TODO.md

@@ -0,0 +1,2 @@
+1. Add puppet client to compute resource
+2. Decouple from AWS and include common resources that exist across vendors

data/VERSION

@@ -1 +1 @@
-2.19.6
+2.19.7

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.19.6"
+  s.version = "2.19.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2013-02-14"
+  s.date = "2013-09-05"
   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 = [
@@ -25,17 +25,18 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.md",
     "Rakefile",
+    "TODO.md",
     "VERSION",
     "cloudster.gemspec",
     "lib/cloudster.rb",
     "lib/cloudster/chef_client.rb",
     "lib/cloudster/cloud.rb",
     "lib/cloudster/cloud_front.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/inner_merge.rb",
     "lib/cloudster/options_manager.rb",
     "lib/cloudster/output.rb",
     "lib/cloudster/rds.rb",
@@ -43,11 +44,11 @@ Gem::Specification.new do |s|
     "spec/chef_client_spec.rb",
     "spec/cloud_front_spec.rb",
     "spec/cloud_spec.rb",
-    "spec/deep_merge_spec.rb",
     "spec/ec2_spec.rb",
     "spec/elastic_ip_spec.rb",
     "spec/elasticache_spec.rb",
     "spec/elb_spec.rb",
+    "spec/inner_merge_spec.rb",
     "spec/output_spec.rb",
     "spec/rds_spec.rb",
     "spec/s3_spec.rb",
@@ -56,34 +57,31 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/emilsoman/cloudster"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "Cloudster gem - a Ruby interface for provisioning your Amazon Cloud."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fog>, [">= 0"])
+      s.add_runtime_dependency(%q<fog>, ["= 1.10.0"])
       s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
     else
-      s.add_dependency(%q<fog>, [">= 0"])
+      s.add_dependency(%q<fog>, ["= 1.10.0"])
       s.add_dependency(%q<json>, ["~> 1.7.7"])
-      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     end
   else
-    s.add_dependency(%q<fog>, [">= 0"])
+    s.add_dependency(%q<fog>, ["= 1.10.0"])
     s.add_dependency(%q<json>, ["~> 1.7.7"])
-    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
   end
 end
 

data/lib/cloudster.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'fog'
 require 'cloudster/output'
 require 'cloudster/options_manager'
-require 'cloudster/deep_merge'
+require 'cloudster/inner_merge'
 include OptionsManager
 require 'cloudster/ec2'
 require 'cloudster/elb'

data/lib/cloudster/chef_client.rb

@@ -56,7 +56,7 @@ module Cloudster
       ec2_template = ec2.template
       @instance_name = ec2.name
       chef_client_template = template
-      ec2.template.deep_merge(chef_client_template)
+      ec2.template.inner_merge(chef_client_template)
     end
 
     private

data/lib/cloudster/cloud.rb

@@ -456,7 +456,7 @@ module Cloudster
         response = e.response
       end
       not_found_status = 404
-      return response.status == not_found_status
+      return response[:status] == not_found_status
     end
 
     private

data/lib/cloudster/cloud_front.rb

@@ -38,7 +38,7 @@ module Cloudster
       s3_template = s3.template
       @instance_name = s3.name
       cloud_front_template = template
-      s3.template.deep_merge(cloud_front_template)
+      s3.template.inner_merge(cloud_front_template)
     end
 
     private

data/lib/cloudster/ec2.rb

@@ -96,7 +96,8 @@ module Cloudster
           'private_dns_name' => {'Fn::GetAtt' => [options[:name], 'PrivateDnsName']},
           'public_dns_name' => {'Fn::GetAtt' => [options[:name], 'PublicDnsName']},
           'private_ip' => {'Fn::GetAtt' => [options[:name], 'PrivateIp']},
-          'public_ip' => {'Fn::GetAtt' => [options[:name], 'PublicIp']}
+          'public_ip' => {'Fn::GetAtt' => [options[:name], 'PublicIp']},
+          'instance_id' => { "Ref" => options[:name] }
         }
       }
       template['Outputs'] = output_template(outputs)

data/lib/cloudster/elastic_ip.rb

@@ -40,7 +40,7 @@ module Cloudster
       ec2_template = ec2.template
       @instance_name = ec2.name
       elastic_ip_template = template
-      ec2.template.deep_merge(elastic_ip_template)
+      ec2.template.inner_merge(elastic_ip_template)
     end
 
     private

data/lib/cloudster/inner_merge.rb

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

data/spec/chef_client_spec.rb

@@ -95,7 +95,8 @@ describe Cloudster::ChefClient do
                     {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["AppServer", "PrivateDnsName"]}]]},
                     {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["AppServer", "PublicDnsName"]}]]},
                     {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["AppServer", "PrivateIp"]}]]},
-                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]}
+                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]},
+                    {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "AppServer"}]]}
                   ]
                 ]
               }

data/spec/cloud_spec.rb

@@ -74,7 +74,8 @@ describe Cloudster::Cloud do
                     {"Fn::Join" => ["|", ["private_dns_name", {'Fn::GetAtt' => ['Ec2Instance1', 'PrivateDnsName']}]]},
                     {"Fn::Join" => ["|", ["public_dns_name", {'Fn::GetAtt' => ['Ec2Instance1', 'PublicDnsName']}]]},
                     {"Fn::Join" => ["|", ["private_ip", {'Fn::GetAtt' => ['Ec2Instance1', 'PrivateIp']}]]},
-                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance1', 'PublicIp']}]]}
+                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance1', 'PublicIp']}]]},
+                    {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "Ec2Instance1"}]]}
                   ]
                 ]
               }
@@ -87,7 +88,8 @@ describe Cloudster::Cloud do
                     {"Fn::Join" => ["|", ["private_dns_name", {'Fn::GetAtt' => ['Ec2Instance2', 'PrivateDnsName']}]]},
                     {"Fn::Join" => ["|", ["public_dns_name", {'Fn::GetAtt' => ['Ec2Instance2', 'PublicDnsName']}]]},
                     {"Fn::Join" => ["|", ["private_ip", {'Fn::GetAtt' => ['Ec2Instance2', 'PrivateIp']}]]},
-                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance2', 'PublicIp']}]]}
+                    {"Fn::Join" => ["|", ["public_ip", {'Fn::GetAtt' => ['Ec2Instance2', 'PublicIp']}]]},
+                    {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "Ec2Instance2"}]]}
                   ]
                 ]
               }
@@ -215,30 +217,24 @@ describe Cloudster::Cloud do
   describe "#is_s3_bucket_name_available?" do
     it "should return true if bucket is available" do
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
-      response = double('Response')
-      response.stub(:status).and_return(404)
       s3 = double('S3')
-      s3.should_receive(:get_bucket).and_raise(Excon::Errors.status_error({:expects => 200}, response))
+      s3.should_receive(:get_bucket).and_raise(Excon::Errors.status_error({:expects => 200}, {:status => 404}))
       Fog::Storage::AWS.should_receive(:new).and_return(s3)
       cloud.is_s3_bucket_name_available?('test-bucket-name').should be_true
     end
 
     it "should return false if bucket access is forbidden" do
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
-      response = double('Response')
-      response.stub(:status).and_return(403)
       s3 = double('S3')
-      s3.should_receive(:get_bucket).and_raise(Excon::Errors.status_error({:expects => 200}, response))
+      s3.should_receive(:get_bucket).and_raise(Excon::Errors.status_error({:expects => 200}, {:status => 403}))
       Fog::Storage::AWS.should_receive(:new).and_return(s3)
       cloud.is_s3_bucket_name_available?('test-bucket-name').should be_false
     end
 
     it "should return false if bucket is already owned by user" do
       cloud = Cloudster::Cloud.new(:access_key_id => 'test', :secret_access_key => 'test')
-      response = double('Response')
-      response.stub(:status).and_return(200)
       s3 = double('S3')
-      s3.should_receive(:get_bucket).and_return response
+      s3.should_receive(:get_bucket).and_return({:status => 200})
       Fog::Storage::AWS.should_receive(:new).and_return(s3)
       cloud.is_s3_bucket_name_available?('test-bucket-name').should be_false
     end

data/spec/ec2_spec.rb

@@ -36,7 +36,8 @@ describe Cloudster::Ec2 do
                   {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["name", "PrivateDnsName"]}]]},
                   {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["name", "PublicDnsName"]}]]},
                   {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["name", "PrivateIp"]}]]},
-                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]}
+                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]},
+                  {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "name"}]]}
                 ]
               ]
             }
@@ -72,7 +73,8 @@ describe Cloudster::Ec2 do
                   {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["name", "PrivateDnsName"]}]]},
                   {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["name", "PublicDnsName"]}]]},
                   {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["name", "PrivateIp"]}]]},
-                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]}
+                  {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["name", "PublicIp"]}]]},
+                  {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "name"}]]}
                 ]
               ]
             }

data/spec/elastic_ip_spec.rb

@@ -43,7 +43,8 @@ describe Cloudster::ChefClient do
                     {"Fn::Join"=>["|", ["private_dns_name", {"Fn::GetAtt"=>["AppServer", "PrivateDnsName"]}]]},
                     {"Fn::Join"=>["|", ["public_dns_name", {"Fn::GetAtt"=>["AppServer", "PublicDnsName"]}]]},
                     {"Fn::Join"=>["|", ["private_ip", {"Fn::GetAtt"=>["AppServer", "PrivateIp"]}]]},
-                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]}
+                    {"Fn::Join"=>["|", ["public_ip", {"Fn::GetAtt"=>["AppServer", "PublicIp"]}]]},
+                    {"Fn::Join"=>["|", ["instance_id", {"Ref"=> "AppServer"}]]}
                   ]
                 ]
               }

data/spec/{deep_merge_spec.rb → inner_merge_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Hash" do
-  describe "#deep_merge" do
+  describe "#inner_merge" do
     it "should do a deep merge for new keys and deep override for existing keys" do
       hash1 = {
         'key1' => 'value1',
@@ -17,7 +17,7 @@ describe "Hash" do
           'inner_key2' =>'inner_value_to_override'
         }
       }
-      hash1.deep_merge(hash2).should == {
+      hash1.inner_merge(hash2).should == {
         "key1"=>"value1",
         "key2"=>{
           "inner_key1"=>"inner_value1",

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'coveralls'
+Coveralls.wear!
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.19.6
-  prerelease: 
+  version: 2.19.7
 platform: ruby
 authors:
 - Emil Soman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,76 +34,53 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
-description: ! "Cloudster is a Ruby gem that was born to cut the learning curve involved
+        version: 1.8.7
+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
@@ -127,17 +100,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - VERSION
 - cloudster.gemspec
 - lib/cloudster.rb
 - lib/cloudster/chef_client.rb
 - lib/cloudster/cloud.rb
 - lib/cloudster/cloud_front.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/inner_merge.rb
 - lib/cloudster/options_manager.rb
 - lib/cloudster/output.rb
 - lib/cloudster/rds.rb
@@ -145,11 +119,11 @@ files:
 - spec/chef_client_spec.rb
 - spec/cloud_front_spec.rb
 - spec/cloud_spec.rb
-- spec/deep_merge_spec.rb
 - spec/ec2_spec.rb
 - spec/elastic_ip_spec.rb
 - spec/elasticache_spec.rb
 - spec/elb_spec.rb
+- spec/inner_merge_spec.rb
 - spec/output_spec.rb
 - spec/rds_spec.rb
 - spec/s3_spec.rb
@@ -157,29 +131,25 @@ files:
 homepage: http://github.com/emilsoman/cloudster
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -177422495
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cloudster gem - a Ruby interface for provisioning your Amazon Cloud.
 test_files: []

data/lib/cloudster/deep_merge.rb

@@ -1,10 +0,0 @@
-# Stolen shamelessly from Rails : 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