cloudster 2.19.7 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714fdfb934ab6e43b39832bcb3b280415f208562
-  data.tar.gz: a8b009d410769dcbff93ffda190ad2851bcf7622
+  metadata.gz: 65213c19f49cad89f8f96711b46476ba6d216f5b
+  data.tar.gz: 02f3da6e9866c8198a68df710b3180c4fd0705d3
 SHA512:
-  metadata.gz: d441d0b8cee377c24ab15f4aff6ad048b123820a6e7e7be49f81387007f4aecb812dc29ff2f51aa7f8e61d2967cae8edd6fc34f315a77aa2bd7cfbc08c1fdc76
-  data.tar.gz: c1c4f004ff2c2606fbd9b08b73f0944e1bea0288ba6dc79a3d8336e2a889cd22486b8e24debae9d7dec3131609b3bc400bd27df29539fef0e4548169d23789e8
+  metadata.gz: 04f46afbccb3fdd8e061f39094cf0c0fe65918a83632e0962252f5bb850c57b9c55f53684f0fbbfe5a167c296ab1f06c7686958253ecbdbe2ea8742312cecf80
+  data.tar.gz: 0d97b0b5128705db2d4a947fd479d075fc1cfe75ee895a2aae96a4adbe0cf2e29112c9da20575e845b03647f28f22090b91cdcfea545e40e91b4bf5b6ec29f6a

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
-before_install:
-  - gem install nokogiri -- --with-cflags='--std=gnu99'
 rvm:
   - 1.9.3
   - 1.9.2

data/Gemfile

@@ -1,16 +1,11 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-gem "fog", "1.10.0"
-gem "json", "~>1.7.7"
+gem "fog", "1.15.0"
+
 group :development do
   gem "rdoc"
   gem "bundler"
-  gem "jeweler", "~> 1.8.7"
+  gem "jeweler", "~> 1.8.8"
 end
 
 group :test do

data/Gemfile.lock

@@ -3,26 +3,25 @@ GEM
   specs:
     addressable (2.3.5)
     builder (3.2.2)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     diff-lcs (1.2.4)
     excon (0.25.3)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    fog (1.10.0)
+    fog (1.15.0)
       builder
-      excon (~> 0.14)
+      excon (~> 0.25.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
+      nokogiri (~> 1.5)
       ruby-hmac
     formatador (0.2.4)
     git (1.2.6)
@@ -36,7 +35,7 @@ GEM
     hashie (2.0.5)
     highline (1.6.19)
     httpauth (0.2.0)
-    jeweler (1.8.7)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -45,16 +44,16 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
+    json (1.8.0)
     jwt (0.1.8)
       multi_json (>= 1.5)
     mime-types (1.25)
-    multi_json (1.7.9)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     oauth2 (0.9.2)
       faraday (~> 0.8)
@@ -74,7 +73,7 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     ruby-hmac (0.4.0)
@@ -82,7 +81,10 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
+    tins (0.12.0)
 
 PLATFORMS
   ruby
@@ -90,8 +92,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   coveralls (>= 0.5.7)
-  fog (= 1.10.0)
-  jeweler (~> 1.8.7)
-  json (~> 1.7.7)
+  fog (= 1.15.0)
+  jeweler (~> 1.8.8)
   rdoc
   rspec

data/VERSION

@@ -1 +1 @@
-2.19.7
+2.20.0

data/cloudster.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudster"
-  s.version = "2.19.7"
+  s.version = "2.20.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2013-09-05"
+  s.date = "2013-10-17"
   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 = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     "lib/cloudster/elastic_ip.rb",
     "lib/cloudster/elasticache.rb",
     "lib/cloudster/elb.rb",
-    "lib/cloudster/inner_merge.rb",
+    "lib/cloudster/hash_additions.rb",
     "lib/cloudster/options_manager.rb",
     "lib/cloudster/output.rb",
     "lib/cloudster/rds.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     "spec/elastic_ip_spec.rb",
     "spec/elasticache_spec.rb",
     "spec/elb_spec.rb",
-    "spec/inner_merge_spec.rb",
+    "spec/hash_additions.rb",
     "spec/output_spec.rb",
     "spec/rds_spec.rb",
     "spec/s3_spec.rb",
@@ -64,24 +64,21 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fog>, ["= 1.10.0"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_runtime_dependency(%q<fog>, ["= 1.15.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
     else
-      s.add_dependency(%q<fog>, ["= 1.10.0"])
-      s.add_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_dependency(%q<fog>, ["= 1.15.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
     end
   else
-    s.add_dependency(%q<fog>, ["= 1.10.0"])
-    s.add_dependency(%q<json>, ["~> 1.7.7"])
+    s.add_dependency(%q<fog>, ["= 1.15.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
   end
 end
 

data/lib/cloudster.rb

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

data/lib/cloudster/cloud.rb

@@ -71,7 +71,7 @@ module Cloudster
       }
       cloud_template['Resources'] = resource_template if !resource_template.empty?
       cloud_template['Outputs'] = output_template if !output_template.empty?
-      return cloud_template.to_json
+      return cloud_template.delete_nil.to_json
     end
 
     # Triggers the stack creation

data/lib/cloudster/cloud_front.rb

@@ -18,6 +18,9 @@ module Cloudster
     def initialize(options = {})
       require_options(options, [:name])
       @name = options[:name]
+      @enabled = options[:enabled] || true
+      @default_root_object = options[:default_root_object] || 'index.html'
+      @aliases = options[:aliases] || []
     end
 
     # Merges the required CloudFormation template for adding an CloudFront to an s3 instance
@@ -47,11 +50,22 @@ module Cloudster
             @name => {
                 "Type" => "AWS::CloudFront::Distribution",
                 "Properties" => {
-                  "DistributionConfig" => {
-                    "S3Origin" => {
-                      "DNSName"=> {"Fn::GetAtt" => [@instance_name, "DomainName"]},
+                  "DistributionConfig"=> {
+                    "Origins"=>[{
+                      "DomainName"=> {"Fn::GetAtt" => [@instance_name, "DomainName"]},
+                      "Id"=>@instance_name,
+                      "S3OriginConfig"=> {}
+                    }],
+                    "DefaultRootObject" => @default_root_object,
+                    "DefaultCacheBehavior" => {
+                      "TargetOriginId" => @instance_name,
+                      "ForwardedValues" => {
+                        "QueryString" => "false"
+                      },
+                      "ViewerProtocolPolicy" => "allow-all"
                     },
-                    "Enabled" => "true"
+                    "Aliases"=> @aliases,
+                    "Enabled"=> @enabled.to_s
                   }
                 }
             }
@@ -59,7 +73,8 @@ module Cloudster
         }
         outputs = {
           @name => {
-            'domain_name' => {'Fn::GetAtt' => [@name, 'DomainName']}
+            'domain_name' => {'Fn::GetAtt' => [@name, 'DomainName']},
+            'distribution_id' => { "Ref" => @name }
           }
         }
         template['Outputs'] = output_template(outputs)

data/lib/cloudster/{inner_merge.rb → hash_additions.rb}

@@ -7,4 +7,7 @@ class Hash
     end
     self
   end
+  def delete_nil
+    delete_if{|k, v| v.nil? or v.instance_of?(Hash) && v.delete_nil.nil? }
+  end
 end

data/lib/cloudster/s3.rb

@@ -14,7 +14,7 @@ module Cloudster
     # * options<~Hash>
     #   * :name : String representing the resource name (Required)
     #   * :access_control : String consisting of one of the predefined permission values: Private | PublicRead | PublicReadWrite | AuthenticatedRead | BucketOwnerRead | BucketOwnerFullControl
-    #   * :website_configuration : A hash containing the name of the index document and name of the error document. ( Example: {"index_document" => "index.html", "error_document" => "error.html"} )
+    #   * :website_configuration : A hash containing the name of the index document and name of the error document. ( Example: {:index_document => "index.html", :error_document => "error.html"} )
     #
     # ==== Examples
     #   bucket = Cloudster::S3.new(
@@ -58,7 +58,7 @@ module Cloudster
     # * options<~Hash>
     #   * :name : String representing the resource name (Required)
     #   * :access_control : String consisting of one of the predefined permission value. ( Example: PublicRead )
-    #   * :website_configuration : A hash containing the name of the index document and name of the error document. ( Example: {"index_document" => "index.html", "error_document" => "error.html"} )
+    #   * :website_configuration : A hash containing the name of the index document and name of the error document. ( Example: {:index_document => "index.html", :error_document => "error.html"} )
     #
     # ==== Returns
     # * Ruby hash version of the Cloud Formation template for S3
@@ -67,7 +67,7 @@ module Cloudster
       properties = {}
       properties.merge!({"AccessControl" => options[:access_control]}) unless options[:access_control].nil?
       unless options[:website_configuration].nil?
-        properties.merge!({"WebsiteConfiguration" => {"IndexDocument" => options[:website_configuration]["index_document"], "ErrorDocument" => options[:website_configuration]["error_document"]}})
+        properties.merge!({"WebsiteConfiguration" => {"IndexDocument" => options[:website_configuration][:index_document], "ErrorDocument" => options[:website_configuration][:error_document]}})
       end
       template = {
         'Resources' => {

data/spec/cloud_front_spec.rb

@@ -11,8 +11,11 @@ describe Cloudster::ChefClient do
   end
   describe '#add_to' do
     it "should add elastic ip configuration to ec2 template" do
-      bucket = bucket = Cloudster::S3.new(:name => 'S3ResourceName',:access_control => 'PublicRead')
-      cloud_front = Cloudster::CloudFront.new(:name => 'CloudFront')
+      bucket = Cloudster::S3.new(:name => 'S3ResourceName',:access_control => 'PublicRead')
+      cloud_front = Cloudster::CloudFront.new(:name => 'CloudFront',
+                                              :default_root_object => 'index.html',
+                                              :aliases => ['mysite.example.com', 'yoursite.example.com'],
+                                              :enabled => true)
       cloud_front.add_to bucket
       bucket.template.should ==
         {
@@ -27,9 +30,20 @@ describe Cloudster::ChefClient do
               "Type"=>"AWS::CloudFront::Distribution",
               "Properties"=>{
                 "DistributionConfig"=> {
-                  "S3Origin" => {
-                    "DNSName"=>{"Fn::GetAtt"=>["S3ResourceName", "DomainName"]}
+                  "Origins"=>[{
+                    "DomainName"=> {"Fn::GetAtt" => ["S3ResourceName", "DomainName"]},
+                    "Id"=>"S3ResourceName",
+                    "S3OriginConfig"=> {}
+                  }],
+                  "DefaultRootObject"=>"index.html",
+                  "DefaultCacheBehavior" => {
+                    "TargetOriginId" => "S3ResourceName",
+                    "ForwardedValues" => {
+                      "QueryString" => "false"
+                    },
+                    "ViewerProtocolPolicy" => "allow-all"
                   },
+                  "Aliases"=>["mysite.example.com", "yoursite.example.com"],
                   "Enabled"=>"true"
                 }
               }
@@ -51,7 +65,8 @@ describe Cloudster::ChefClient do
               "Value"=>{
                 "Fn::Join"=>[",",
                   [
-                    {"Fn::Join"=>["|", ["domain_name", {"Fn::GetAtt"=>["CloudFront", "DomainName"]}]]}
+                    {"Fn::Join"=>["|", ["domain_name", {"Fn::GetAtt"=>["CloudFront", "DomainName"]}]]},
+                    {"Fn::Join"=>["|", ["distribution_id", {"Ref"=>"CloudFront"}]]}
                   ]
                 ]
               }

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

@@ -28,4 +28,26 @@ describe "Hash" do
       }
     end
   end
+  describe "#delete_nil" do
+    it "should delete keys which have nil values recursively" do
+      hash = {
+        'key1' => 'value1',
+        'key2' => {
+          'inner_key1' =>'inner_value1',
+          'inner_key2' =>nil
+        },
+        'key3' => nil,
+        'key4' => {
+          'key5' => nil
+        }
+      }
+      hash.delete_nil.should == {
+        'key1' => 'value1',
+        'key2' => {
+          'inner_key1' =>'inner_value1'
+        },
+        'key4' => {}
+      }
+    end
+  end
 end

data/spec/s3_spec.rb

@@ -19,7 +19,7 @@ describe Cloudster::S3 do
       }
     end
     it "should return a ruby hash for the resource cloudformation template" do
-      s3 = Cloudster::S3.new(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {"index_document" => "index.html", "error_document" => "error.html"} )
+      s3 = Cloudster::S3.new(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {:index_document => "index.html", :error_document => "error.html"} )
       s3.template.should == {
         'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {"AccessControl" => "PublicRead", "WebsiteConfiguration" => { "IndexDocument" => "index.html", "ErrorDocument" => "error.html" } }}},
         "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}
@@ -32,7 +32,7 @@ describe Cloudster::S3 do
       expect { Cloudster::S3.template() }.to raise_error(ArgumentError, 'Missing required argument: name')
     end
     it "should return a ruby hash for the resource cloudformation template" do
-      hash = Cloudster::S3.template(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {"index_document" => "index.html", "error_document" => "error.html"} )
+      hash = Cloudster::S3.template(:name => 'bucket_name', :access_control => "PublicRead", :website_configuration => {:index_document => "index.html", :error_document => "error.html"} )
       hash.should == {
         'Resources' => {'bucket_name' => {'Type' => 'AWS::S3::Bucket', 'Properties' => {"AccessControl" => "PublicRead", "WebsiteConfiguration" => { "IndexDocument" => "index.html", "ErrorDocument" => "error.html" } }}},
         "Outputs" => {"bucket_name"=>{"Value"=>{"Fn::Join"=>[",", [{"Fn::Join"=>["|", ["bucket_name", {"Ref"=>"bucket_name"}]]}, {"Fn::Join"=>["|", ["dns_name", {"Fn::GetAtt"=>["bucket_name", "DomainName"]}]]}, {"Fn::Join"=>["|", ["website_url", {"Fn::GetAtt"=>["bucket_name", "WebsiteURL"]}]]}]]}}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudster
 version: !ruby/object:Gem::Version
-  version: 2.19.7
+  version: 2.20.0
 platform: ruby
 authors:
 - Emil Soman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.8.8
 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
@@ -111,7 +97,7 @@ files:
 - lib/cloudster/elastic_ip.rb
 - lib/cloudster/elasticache.rb
 - lib/cloudster/elb.rb
-- lib/cloudster/inner_merge.rb
+- lib/cloudster/hash_additions.rb
 - lib/cloudster/options_manager.rb
 - lib/cloudster/output.rb
 - lib/cloudster/rds.rb
@@ -123,7 +109,7 @@ files:
 - spec/elastic_ip_spec.rb
 - spec/elasticache_spec.rb
 - spec/elb_spec.rb
-- spec/inner_merge_spec.rb
+- spec/hash_additions.rb
 - spec/output_spec.rb
 - spec/rds_spec.rb
 - spec/s3_spec.rb